net: sh_eth: Zap port variable
PATCH 1/4 net: sh_eth: Zap port variable
Inline this variable which is quite useless.
--- drivers/net/sh_eth.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-)
drivers/net/sh_eth.c +14 -16
@@ -63,8 +63,8 @@static int sh_eth_send_common (struct sh_eth_dev *eth,void *packet,int len) { -int port = eth->port, ret =0 , timeout; -struct sh_eth_info *port_info = ð->port_info[port]; +int ret =0 , timeout; +struct sh_eth_info *port_info = ð->port_info[eth->port];if (!packet || len >0xffff ) {printf (SHETHER_NAME ": %s: Invalid argument\n" , __func__);
@@ -120,8 +120,8 @@ err:static int sh_eth_recv_start (struct sh_eth_dev *eth) { -int port = eth->port, len =0 ; -struct sh_eth_info *port_info = ð->port_info[port]; +int len =0 ; +struct sh_eth_info *port_info = ð->port_info[eth->port];/* Check if the rx descriptor is ready */ invalidate_cache (port_info->rx_desc_cur,sizeof (struct rx_desc_s ));
@@ -192,9 +192,9 @@ static int sh_eth_reset(struct sh_eth_dev *eth)static int sh_eth_tx_desc_init (struct sh_eth_dev *eth) { -int port = eth->port, i, ret =0 ; +int i, ret =0 ;u32 alloc_desc_size =NUM_TX_DESC *sizeof (struct tx_desc_s ); -struct sh_eth_info *port_info = ð->port_info[port]; +struct sh_eth_info *port_info = ð->port_info[eth->port];struct tx_desc_s *cur_tx_desc;/*
@@ -245,9 +245,9 @@ err:static int sh_eth_rx_desc_init (struct sh_eth_dev *eth) { -int port = eth->port, i, ret =0 ; +int i, ret =0 ;u32 alloc_desc_size =NUM_RX_DESC *sizeof (struct rx_desc_s ); -struct sh_eth_info *port_info = ð->port_info[port]; +struct sh_eth_info *port_info = ð->port_info[eth->port];struct rx_desc_s *cur_rx_desc;u8 *rx_buf;
@@ -318,8 +318,7 @@ err:static void sh_eth_tx_desc_free (struct sh_eth_dev *eth) { -int port = eth->port; -struct sh_eth_info *port_info = ð->port_info[port]; +struct sh_eth_info *port_info = ð->port_info[eth->port];if (port_info->tx_desc_alloc) {free (port_info->tx_desc_alloc);
@@ -329,8 +328,7 @@ static void sh_eth_tx_desc_free(struct sh_eth_dev *eth)static void sh_eth_rx_desc_free (struct sh_eth_dev *eth) { -int port = eth->port; -struct sh_eth_info *port_info = ð->port_info[port]; +struct sh_eth_info *port_info = ð->port_info[eth->port];if (port_info->rx_desc_alloc) {free (port_info->rx_desc_alloc);
@@ -523,7 +521,7 @@ static int sh_eth_start_common(struct sh_eth_dev *eth)static int sh_eth_phy_config_legacy (struct sh_eth_dev *eth) {int port = eth->port, ret =0 ; -struct sh_eth_info *port_info = ð->port_info[port]; +struct sh_eth_info *port_info = ð->port_info[eth->port];struct eth_device *dev = port_info->dev;struct phy_device *phydev;
@@ -546,7 +544,7 @@ static int sh_eth_send_legacy(struct eth_device *dev, void *packet, int 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]; +struct sh_eth_info *port_info = ð->port_info[eth->port];uchar *packet = (uchar *)ADDR_TO_P2 (port_info->rx_desc_cur->rd2); len =sh_eth_recv_start (eth);
@@ -750,8 +748,8 @@ static int sh_eth_phy_config(struct udevice *dev)struct sh_ether_priv *priv =dev_get_priv (dev);struct eth_pdata *pdata =dev_get_platdata (dev);struct sh_eth_dev *eth = &priv->shdev; -int port = eth->port, ret =0 ; -struct sh_eth_info *port_info = ð->port_info[port]; +int ret =0 ; +struct sh_eth_info *port_info = ð->port_info[eth->port];struct phy_device *phydev;int mask =0xffffffff ;
Signature · 1 line
2.15.1
PATCH 2/4 net: sh_eth: Return directly from sh_eth_recv_start
Drop the len variable, it's useless.
--- drivers/net/sh_eth.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/sh_eth.c +1 -4
@@ -120,7 +120,6 @@ err:static int sh_eth_recv_start (struct sh_eth_dev *eth) { -int len =0 ;struct sh_eth_info *port_info = ð->port_info[eth->port];/* Check if the rx descriptor is ready */
@@ -132,9 +131,7 @@ static int sh_eth_recv_start(struct sh_eth_dev *eth)if (port_info->rx_desc_cur->rd0 &RD_RFE )return -EINVAL ; - len = port_info->rx_desc_cur->rd1 &0xffff ; - -return len; +return port_info->rx_desc_cur->rd1 &0xffff ; }static void sh_eth_recv_finish (struct sh_eth_dev *eth)
Signature · 1 line
2.15.1
PATCH 2/4 net: sh_eth: Return directly from sh_eth_recv_start
Quoted 5 lines · Marek Vasut
Drop the len variable, it's useless.
Signed-off-by Marek Vasut <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Joe Hershberger <[email protected]>
PATCH 3/4 net: sh_eth: Fix checkpatch warning
In reply to Marek VasutFix minor checkpatch warning about udelay(3000) being too long and should be replaced by mdelay(3).
--- drivers/net/sh_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/sh_eth.c +1 -1
@@ -179,7 +179,7 @@ static int sh_eth_reset(struct sh_eth_dev *eth)return ret;#else sh_eth_write (port_info,sh_eth_read (port_info,EDMR ) |EDMR_SRST ,EDMR ); -udelay (3000 ); +mdelay (3 );sh_eth_write (port_info,sh_eth_read (port_info,EDMR ) & ~EDMR_SRST ,EDMR );
Signature · 1 line
2.15.1
PATCH 3/4 net: sh_eth: Fix checkpatch warning
Quoted 6 lines · Marek Vasut
Fix minor checkpatch warning about udelay(3000) being too long and should be replaced by mdelay(3).
Signed-off-by Marek Vasut <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Joe Hershberger <[email protected]>
PATCH 4/4 net: sh_eth: Fix DT base address fetching
In reply to Marek VasutDrop the whole map/unmap_physmem stuff and just use the address already obtained from DT in ofdata_to_platdata(), instead of repeating that, wrongly, in probe.
--- drivers/net/sh_eth.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/net/sh_eth.c +4 -10
@@ -675,7 +675,7 @@ struct sh_ether_priv {struct sh_eth_dev shdev;struct mii_dev *bus; -void __iomem *iobase; +phys_addr_t iobase;struct clk clk;struct gpio_desc reset_gpio; };
@@ -811,15 +811,13 @@ static int sh_ether_probe(struct udevice *udev)struct sh_ether_priv *priv =dev_get_priv (udev);struct sh_eth_dev *eth = &priv->shdev;struct mii_dev *mdiodev; -void __iomem *iobase;int ret; - iobase =map_physmem (pdata->iobase,0x1000 ,MAP_NOCACHE ); - priv->iobase = iobase; + priv->iobase = pdata->iobase; ret =clk_get_by_index (udev,0 , &priv->clk);if (ret <0 ) - goto err_mdio_alloc; +return ret;gpio_request_by_name (udev,"reset-gpios" ,0 , &priv->reset_gpio,GPIOD_IS_OUT );
@@ -827,7 +825,7 @@ static int sh_ether_probe(struct udevice *udev) mdiodev =mdio_alloc ();if (!mdiodev) { ret = -ENOMEM ; - goto err_mdio_alloc; +return ret; } mdiodev->read = bb_miiphy_read;
@@ -850,8 +848,6 @@ static int sh_ether_probe(struct udevice *udev) err_mdio_register:mdio_free (mdiodev); -err_mdio_alloc: -unmap_physmem (priv->iobase,MAP_NOCACHE );return ret; }
@@ -868,8 +864,6 @@ static int sh_ether_remove(struct udevice *udev)if (dm_gpio_is_valid (&priv->reset_gpio))dm_gpio_free (udev, &priv->reset_gpio); -unmap_physmem (priv->iobase,MAP_NOCACHE ); -return 0 ; }
Signature · 1 line
2.15.1
PATCH 4/4 net: sh_eth: Fix DT base address fetching
Quoted 7 lines · Marek Vasut
Drop the whole map/unmap_physmem stuff and just use the address already obtained from DT in
ofdata_to_platdata(), instead of repeating that, wrongly, in probe.Signed-off-by Marek Vasut <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Joe Hershberger <[email protected]>
PATCH 1/4 net: sh_eth: Zap port variable
In reply to Marek VasutQuoted 6 lines · Marek Vasut
Inline this variable which is quite useless.
Signed-off-by Marek Vasut <[email protected]>Cc Nobuhiro Iwamatsu <[email protected]>Cc Joe Hershberger <[email protected]>---