]> git.kernelconcepts.de Git - karo-tx-uboot.git/commitdiff
tsec: fix the return value for tsec_eth_init()
authorTimur Tabi <timur@freescale.com>
Tue, 8 Jun 2010 13:21:21 +0000 (08:21 -0500)
committerBen Warren <biggerbadderben@gmail.com>
Mon, 12 Jul 2010 07:14:28 +0000 (00:14 -0700)
The Ethernet initialization functions are supposed to return the number of
devices initialized, so fix tsec_eth_init() so that they returns the number of
TSECs initialized, instead of just zero.  This is safe because the return value
is currently ignored by all callers, but now they don't have to ignore it.

In general, if an function initializes only one device, then it should return
a negative number if there's an error.  If it initializes more than one device,
then it should never return a negative number.

Signed-off-by: Timur Tabi <timur@freescale.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
drivers/net/tsec.c

index bc2707f17a7d15a2c4d5277660a72f3c1dc08be9..54c4a704a502bbc4a7756e4a020a696e6d8f7ce1 100644 (file)
@@ -95,14 +95,23 @@ static struct tsec_info_struct tsec_info[] = {
 #endif
 };
 
+/*
+ * Initialize all the TSEC devices
+ *
+ * Returns the number of TSEC devices that were initialized
+ */
 int tsec_eth_init(bd_t *bis, struct tsec_info_struct *tsecs, int num)
 {
        int i;
+       int ret, count = 0;
 
-       for (i = 0; i < num; i++)
-               tsec_initialize(bis, &tsecs[i]);
+       for (i = 0; i < num; i++) {
+               ret = tsec_initialize(bis, &tsecs[i]);
+               if (ret > 0)
+                       count += ret;
+       }
 
-       return 0;
+       return count;
 }
 
 int tsec_standard_init(bd_t *bis)