net: Remove the bd* parameter from net stack functions

This value is not used by the network stack and is available in the
global data, so stop passing it around.  For the one legacy function
that still expects it (init op on old Ethernet drivers) pass in the
global pointer version directly to avoid changing that interface.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reported-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
(Trival fix to remove an unneeded variable declaration in 4xx_enet.c)

diff --git a/api/api_net.c b/api/api_net.c
index 7b3805e8fdbec822a38739074d107857112d86ee..04e4f4a44eff9ce9d6e4688a978e1179b7599c66 100644 (file)
--- a/api/api_net.c
+++ b/api/api_net.c
@@ -37,7 +37,7 @@ int dev_open_net(void *cookie)
        if (!dev_valid_net(cookie))
                return API_ENODEV;
 
-       if (eth_init(gd->bd) < 0)
+       if (eth_init() < 0)
                return API_EIO;
 
        return 0;

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index f6062557e6677fe0636520f9d7f76a9eedfc8d50..37ea6e90ec62c9f4995a1385872bf5cf49df34d4 100644 (file)
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -644,7 +644,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
 #endif
 #if defined(CONFIG_CMD_NET)
        puts("Net:   ");
-       eth_initialize(gd->bd);
+       eth_initialize();
 #if defined(CONFIG_RESET_PHY_R)
        debug("Reset Ethernet PHY\n");
        reset_phy();

diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c
index 99aa96e23fab0498e7e4bc636ac0ea464e4b9d18..aacfcbf69a93cf9afbccc8f2784abeda5db341ba 100644 (file)
--- a/arch/avr32/lib/board.c
+++ b/arch/avr32/lib/board.c
@@ -244,7 +244,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
 #endif
 #if defined(CONFIG_CMD_NET)
        puts("Net:   ");
-       eth_initialize(gd->bd);
+       eth_initialize();
 #endif
 
 #ifdef CONFIG_GENERIC_ATMEL_MCI

diff --git a/arch/nds32/lib/board.c b/arch/nds32/lib/board.c
index 4c06a4866b1e28307bbc30b26edf6b299bae4339..24a09bc3c21764d1df50e7bfd0770a6f8821c458 100644 (file)
--- a/arch/nds32/lib/board.c
+++ b/arch/nds32/lib/board.c
@@ -383,7 +383,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
 #if defined(CONFIG_CMD_NET)
        puts("Net:   ");
 
-       eth_initialize(gd->bd);
+       eth_initialize();
 #if defined(CONFIG_RESET_PHY_R)
        debug("Reset Ethernet PHY\n");
        reset_phy();

diff --git a/arch/openrisc/lib/board.c b/arch/openrisc/lib/board.c
index 234668538ca0814f580437a3beb1d1594c758586..c26cc8f5031e4edad4b365d4a45505ff78d885cc 100644 (file)
--- a/arch/openrisc/lib/board.c
+++ b/arch/openrisc/lib/board.c
@@ -128,7 +128,7 @@ void board_init(void)
 
 #if defined(CONFIG_CMD_NET)
        puts("NET:   ");
-       eth_initialize(bd);
+       eth_initialize();
 #endif
 
        /* main_loop */

diff --git a/arch/powerpc/lib/board.c b/arch/powerpc/lib/board.c
index 91645d36ee9afcaad5138d55bfaa5ac407fd969b..5ea29cc97467da7edc2e86460396d400342eb354 100644 (file)
--- a/arch/powerpc/lib/board.c
+++ b/arch/powerpc/lib/board.c
@@ -890,7 +890,7 @@ void board_init_r(gd_t *id, ulong dest_addr)
 #if defined(CONFIG_CMD_NET)
        WATCHDOG_RESET();
        puts("Net:   ");
-       eth_initialize(bd);
+       eth_initialize();
 #endif
 
 #if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)

diff --git a/arch/sh/lib/board.c b/arch/sh/lib/board.c
index 1eb7afb89e5ab7d57b14380781ecb4ad63357a90..6dad3c7dbfefcd400daabd34714062ed94d96516 100644 (file)
--- a/arch/sh/lib/board.c
+++ b/arch/sh/lib/board.c
@@ -178,7 +178,7 @@ void sh_generic_init(void)
 #endif
 #if defined(CONFIG_CMD_NET)
        puts("Net:   ");
-       eth_initialize(gd->bd);
+       eth_initialize();
 #endif /* CONFIG_CMD_NET */
 
        while (1) {

diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c
index b311a946c05ec2e264b7c33e444fd999b5e91f2e..d2ac6bcaca96ab4cec8641e31bdd4baaf7c7dc83 100644 (file)
--- a/arch/sparc/lib/board.c
+++ b/arch/sparc/lib/board.c
@@ -351,7 +351,7 @@ void board_init_f(ulong bootflag)
 #if defined(CONFIG_CMD_NET)
        WATCHDOG_RESET();
        puts("Net:   ");
-       eth_initialize(bd);
+       eth_initialize();
 #endif
 
 #if defined(CONFIG_CMD_NET) && defined(CONFIG_RESET_PHY_R)

diff --git a/board/BuS/eb_cpux9k2/cpux9k2.c b/board/BuS/eb_cpux9k2/cpux9k2.c
index 76ad7c443bb9285db808c6df97d02461e94a62ed..3880a0689723cb34d3815927c8458d4525e05b78 100644 (file)
--- a/board/BuS/eb_cpux9k2/cpux9k2.c
+++ b/board/BuS/eb_cpux9k2/cpux9k2.c
@@ -111,7 +111,7 @@ int misc_init_r(void)
 void reset_phy(void)
 {
        udelay(10000);
-       eth_init(gd->bd);
+       eth_init();
 }
 #endif
 

diff --git a/board/BuS/vl_ma2sc/vl_ma2sc.c b/board/BuS/vl_ma2sc/vl_ma2sc.c
index da39c8625821965ec747bcb359890c487bcb020a..e4e1a8572f112243542849dfe53637b1045c2ffd 100644 (file)
--- a/board/BuS/vl_ma2sc/vl_ma2sc.c
+++ b/board/BuS/vl_ma2sc/vl_ma2sc.c
@@ -280,7 +280,7 @@ void reset_phy(void)
         * Initialize ethernet HW addr prior to starting Linux,
         * needed for nfsroot
         */
-       eth_init(gd->bd);
+       eth_init();
 #endif
 }
 #endif

diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
index a301d72e8ce46528b41df428e7d3d7eea9d52827..52504742cd9ceb69eb8655c442c6baf96437497a 100644 (file)
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -275,7 +275,7 @@ void reset_phy(void)
         * Initialize ethernet HW addr prior to starting Linux,
         * needed for nfsroot
         */
-       eth_init(gd->bd);
+       eth_init();
 #endif
 }
 #endif

diff --git a/board/egnite/ethernut5/ethernut5.c b/board/egnite/ethernut5/ethernut5.c
index b45213c245a32a2071cdb93fa7a1f2543fa10d12..67d39844ac615e25edc27216e7e3b2215fb0f742 100644 (file)
--- a/board/egnite/ethernut5/ethernut5.c
+++ b/board/egnite/ethernut5/ethernut5.c
@@ -204,7 +204,7 @@ int board_eth_init(bd_t *bis)
                miiphy_write(devname, 0, MII_BMCR, BMCR_RESET);
        }
        /* Sync environment with network devices, needed for nfsroot. */
-       return eth_init(gd->bd);
+       return eth_init();
 }
 #endif
 

diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c
index 1f7679a240e453cc45d9a7ea1b2f33fccdb2d111..b96f745773128d9aa4a619deb42e24065468b7e4 100644 (file)
--- a/board/ronetix/pm9261/pm9261.c
+++ b/board/ronetix/pm9261/pm9261.c
@@ -288,7 +288,7 @@ void reset_phy(void)
         * Initialize ethernet HW addr prior to starting Linux,
         * needed for nfsroot
         */
-       eth_init(gd->bd);
+       eth_init();
 #endif
 }
 #endif

diff --git a/board/ronetix/pm9g45/pm9g45.c b/board/ronetix/pm9g45/pm9g45.c
index 15aa4acd1129e9ff344006da9422a4eebb2adb05..efc4133bbfe9d78f6048781efba3340dc186982d 100644 (file)
--- a/board/ronetix/pm9g45/pm9g45.c
+++ b/board/ronetix/pm9g45/pm9g45.c
@@ -166,7 +166,7 @@ void reset_phy(void)
         * Initialize ethernet HW addr prior to starting Linux,
         * needed for nfsroot
         */
-       eth_init(gd->bd);
+       eth_init();
 #endif
 }
 #endif

diff --git a/common/board_r.c b/common/board_r.c
index 514bac8667a043bf653bfda42cd65d493d7abaa0..9c2b5a9fe0bca3d81bb91f877b9eae93628326a8 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -590,7 +590,7 @@ static int initr_bbmii(void)
 static int initr_net(void)
 {
        puts("Net:   ");
-       eth_initialize(gd->bd);
+       eth_initialize();
 #if defined(CONFIG_RESET_PHY_R)
        debug("Reset Ethernet PHY\n");
        reset_phy();

diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index ff53705926ace68ec37d001b942090303d077ca4..af4952f680df29c35be680c8498299186e5e4d1f 100644 (file)
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -21,7 +21,7 @@ void spl_net_load_image(const char *device)
        env_relocate();
        setenv("autoload", "yes");
        load_addr = CONFIG_SYS_TEXT_BASE - sizeof(struct image_header);
-       rv = eth_initialize(gd->bd);
+       rv = eth_initialize();
        if (rv == 0) {
                printf("No Ethernet devices found\n");
                hang();

diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c
index 381ec42864fb618c867ad2524b6f5ba452417967..878f1b25336c288e014b4c4c92a9e56c7974049b 100644 (file)
--- a/drivers/net/4xx_enet.c
+++ b/drivers/net/4xx_enet.c
@@ -1719,8 +1719,6 @@ static void mal_err (struct eth_device *dev, unsigned long isr,
                     unsigned long uic, unsigned long maldef,
                     unsigned long mal_errr)
 {
-       EMAC_4XX_HW_PST hw_p = dev->priv;
-
        mtdcr (MAL0_ESR, isr);  /* clear interrupt */
 
        /* clear DE interrupt */
@@ -1728,10 +1726,11 @@ static void mal_err (struct eth_device *dev, unsigned long isr,
        mtdcr (MAL0_RXDEIR, 0x80000000);
 
 #ifdef INFO_4XX_ENET
-       printf ("\nMAL error occured.... ISR = %lx UIC = = %lx  MAL_DEF = %lx  MAL_ERR= %lx \n", isr, uic, maldef, mal_errr);
+       printf("\nMAL error occured.... ISR = %lx UIC = = %lx   MAL_DEF = %lx  MAL_ERR= %lx\n",
+              isr, uic, maldef, mal_errr);
 #endif
 
-       eth_init (hw_p->bis);   /* start again... */
+       eth_init();     /* start again... */
 }
 
 /*-----------------------------------------------------------------------------+

diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 677c89f0486f2a19f334db02b45a58a443b3e2da..87cea7a93209b7fad0fa074c0668dd53ea2d053a 100644 (file)
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -193,11 +193,11 @@ static void nc_send_packet(const char *buf, int len)
 
        if (eth->state != ETH_STATE_ACTIVE) {
                if (eth_is_on_demand_init()) {
-                       if (eth_init(gd->bd) < 0)
+                       if (eth_init() < 0)
                                return;
                        eth_set_last_protocol(NETCONS);
                } else
-                       eth_init_state_only(gd->bd);
+                       eth_init_state_only();
 
                inited = 1;
        }

diff --git a/include/net.h b/include/net.h
index bcf396a4ebabee997e1e39d963253e2cd4f88c1b..df5b64844ad012f60def7ea1022e007c16075720 100644 (file)
--- a/include/net.h
+++ b/include/net.h
@@ -119,7 +119,7 @@ static inline unsigned char *eth_get_ethaddr(void)
 }
 
 /* Set active state */
-static inline __attribute__((always_inline)) int eth_init_state_only(bd_t *bis)
+static inline __attribute__((always_inline)) int eth_init_state_only(void)
 {
        eth_get_dev()->state = ETH_STATE_ACTIVE;
 
@@ -145,7 +145,7 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
 
 int usb_eth_initialize(bd_t *bi);
 
-int eth_initialize(bd_t *bis); /* Initialize network subsystem */
+int eth_initialize(void);              /* Initialize network subsystem */
 void eth_try_another(int first_restart);       /* Change the device */
 void eth_set_current(void);            /* set nterface to ethcur var */
 
@@ -166,7 +166,7 @@ int eth_setenv_enetaddr(char *name, const uchar *enetaddr);
 int eth_getenv_enetaddr_by_index(const char *base_name, int index,
                                 uchar *enetaddr);
 
-int eth_init(bd_t *bis);                       /* Initialize the device */
+int eth_init(void);                    /* Initialize the device */
 int eth_send(void *packet, int length);           /* Send a packet */
 
 #ifdef CONFIG_API

diff --git a/net/eth.c b/net/eth.c
index b86994e9eb546aa50a285dea9aaba6e8dfa17af0..66ecb79d556deb4801e828afa5b5d243e82cac32 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -12,6 +12,8 @@
 #include <phy.h>
 #include <asm/errno.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 void eth_parse_enetaddr(const char *addr, uchar *enetaddr)
 {
        char *end;
@@ -250,7 +252,7 @@ int eth_unregister(struct eth_device *dev)
        return 0;
 }
 
-int eth_initialize(bd_t *bis)
+int eth_initialize(void)
 {
        int num_devices = 0;
        eth_devices = NULL;
@@ -272,10 +274,10 @@ int eth_initialize(bd_t *bis)
         * If not, call a CPU-specific one
         */
        if (board_eth_init != __def_eth_init) {
-               if (board_eth_init(bis) < 0)
+               if (board_eth_init(gd->bd) < 0)
                        printf("Board Net Initialization Failed\n");
        } else if (cpu_eth_init != __def_eth_init) {
-               if (cpu_eth_init(bis) < 0)
+               if (cpu_eth_init(gd->bd) < 0)
                        printf("CPU Net Initialization Failed\n");
        } else
                printf("Net Initialization Skipped\n");
@@ -362,7 +364,7 @@ u32 ether_crc(size_t len, unsigned char const *p)
 #endif
 
 
-int eth_init(bd_t *bis)
+int eth_init(void)
 {
        struct eth_device *old_current, *dev;
 
@@ -387,7 +389,7 @@ int eth_init(bd_t *bis)
        do {
                debug("Trying %s\n", eth_current->name);
 
-               if (eth_current->init(eth_current, bis) >= 0) {
+               if (eth_current->init(eth_current, gd->bd) >= 0) {
                        eth_current->state = ETH_STATE_ACTIVE;
 
                        return 0;

diff --git a/net/net.c b/net/net.c
index 4b3c90e18eee971640995bd2708d8b4726560ff0..e5ab07c81d53dc81b8d92ea620ebbcfc689ee5d0 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -324,7 +324,6 @@ void net_init(void)
 
 int NetLoop(enum proto_t protocol)
 {
-       bd_t *bd = gd->bd;
        int ret = -1;
 
        NetRestarted = 0;
@@ -337,12 +336,12 @@ int NetLoop(enum proto_t protocol)
        if (eth_is_on_demand_init() || protocol != NETCONS) {
                eth_halt();
                eth_set_current();
-               if (eth_init(bd) < 0) {
+               if (eth_init() < 0) {
                        eth_halt();
                        return -1;
                }
        } else
-               eth_init_state_only(bd);
+               eth_init_state_only();
 
 restart:
 #ifdef CONFIG_USB_KEYBOARD
@@ -618,7 +617,7 @@ void NetStartAgain(void)
 #if !defined(CONFIG_NET_DO_NOT_TRY_ANOTHER)
        eth_try_another(!NetRestarted);
 #endif
-       eth_init(gd->bd);
+       eth_init();
        if (NetRestartWrap) {
                NetRestartWrap = 0;
                if (NetDevExists) {