summaryrefslogtreecommitdiff
path: root/net/eth.c
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-03-22 17:09:06 -0500
committerSimon Glass <sjg@chromium.org>2015-04-18 11:11:11 -0600
commitd2eaec600617346a143a07bb073466add7a68e97 (patch)
tree8dd62a6e4142cab8322cdea1a67bda9d5dc62b2c /net/eth.c
parentfce6900b492c18962a098eae837ea345b75f9a75 (diff)
downloadu-boot-d2eaec600617346a143a07bb073466add7a68e97.tar.gz
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)
Diffstat (limited to 'net/eth.c')
-rw-r--r--net/eth.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/net/eth.c b/net/eth.c
index b86994e9eb..66ecb79d55 100644
--- 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;