From dca221bd92cf3befa387a711a2256f1e4e06e51e Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 21 Jan 2018 14:27:51 +0100 Subject: [PATCH] net: sh_eth: Pass sh_eth_dev around Pass sh_eth_dev structure around instead of eth_device, since the later is specific to the legacy networking support. This change is done in preparation for the DM addition. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu Cc: Joe Hershberger --- drivers/net/sh_eth.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index d065141bf9..7b11a5a0d3 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -54,9 +54,8 @@ #define TIMEOUT_CNT 1000 -int sh_eth_send(struct eth_device *dev, void *packet, int len) +static int sh_eth_send_common(struct sh_eth_dev *eth, void *packet, int len) { - struct sh_eth_dev *eth = dev->priv; int port = eth->port, ret = 0, timeout; struct sh_eth_info *port_info = ð->port_info[port]; @@ -112,9 +111,15 @@ err: return ret; } -int sh_eth_recv(struct eth_device *dev) +static int sh_eth_send_legacy(struct eth_device *dev, void *packet, int len) { struct sh_eth_dev *eth = dev->priv; + + return sh_eth_send_common(eth, packet, len); +} + +static int sh_eth_recv_common(struct sh_eth_dev *eth) +{ int port = eth->port, len = 0; struct sh_eth_info *port_info = ð->port_info[port]; uchar *packet; @@ -154,6 +159,13 @@ int sh_eth_recv(struct eth_device *dev) return len; } +static int sh_eth_recv_legacy(struct eth_device *dev) +{ + struct sh_eth_dev *eth = dev->priv; + + return sh_eth_recv_common(eth); +} + static int sh_eth_reset(struct sh_eth_dev *eth) { struct sh_eth_info *port_info = ð->port_info[eth->port]; @@ -569,8 +581,8 @@ int sh_eth_initialize(bd_t *bd) dev->iobase = 0; dev->init = sh_eth_init; dev->halt = sh_eth_halt; - dev->send = sh_eth_send; - dev->recv = sh_eth_recv; + dev->send = sh_eth_send_legacy; + dev->recv = sh_eth_recv_legacy; eth->port_info[eth->port].dev = dev; strcpy(dev->name, SHETHER_NAME); -- 2.39.5