aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2016-03-12 17:29:45 -0500
committerDavid S. Miller <davem@davemloft.net>2016-03-14 15:50:27 -0400
commit4fa8c3cc70b2a0aa090bce174c6f2ac148453690 (patch)
treeb3b3feb7d9ecace2225cf24378c3ac548485ded2
parentd98654a7f314026323df8a50cd9354071f98ac8d (diff)
sh_eth: kill useless initializers
Some of the local variable intializers in the driver turned out to be pointless, kill 'em. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/renesas/sh_eth.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 2e9a78164054..8385d927adc3 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -447,8 +447,8 @@ static bool sh_eth_is_rz_fast_ether(struct sh_eth_private *mdp)
447 447
448static void sh_eth_select_mii(struct net_device *ndev) 448static void sh_eth_select_mii(struct net_device *ndev)
449{ 449{
450 u32 value = 0x0;
451 struct sh_eth_private *mdp = netdev_priv(ndev); 450 struct sh_eth_private *mdp = netdev_priv(ndev);
451 u32 value;
452 452
453 switch (mdp->phy_interface) { 453 switch (mdp->phy_interface) {
454 case PHY_INTERFACE_MODE_GMII: 454 case PHY_INTERFACE_MODE_GMII:
@@ -1231,8 +1231,8 @@ ring_free:
1231 1231
1232static int sh_eth_dev_init(struct net_device *ndev, bool start) 1232static int sh_eth_dev_init(struct net_device *ndev, bool start)
1233{ 1233{
1234 int ret = 0;
1235 struct sh_eth_private *mdp = netdev_priv(ndev); 1234 struct sh_eth_private *mdp = netdev_priv(ndev);
1235 int ret;
1236 1236
1237 /* Soft Reset */ 1237 /* Soft Reset */
1238 ret = sh_eth_reset(ndev); 1238 ret = sh_eth_reset(ndev);
@@ -1355,7 +1355,7 @@ static int sh_eth_txfree(struct net_device *ndev)
1355 struct sh_eth_private *mdp = netdev_priv(ndev); 1355 struct sh_eth_private *mdp = netdev_priv(ndev);
1356 struct sh_eth_txdesc *txdesc; 1356 struct sh_eth_txdesc *txdesc;
1357 int free_num = 0; 1357 int free_num = 0;
1358 int entry = 0; 1358 int entry;
1359 1359
1360 for (; mdp->cur_tx - mdp->dirty_tx > 0; mdp->dirty_tx++) { 1360 for (; mdp->cur_tx - mdp->dirty_tx > 0; mdp->dirty_tx++) {
1361 entry = mdp->dirty_tx % mdp->num_tx_ring; 1361 entry = mdp->dirty_tx % mdp->num_tx_ring;
@@ -1396,10 +1396,10 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
1396 int boguscnt = (mdp->dirty_rx + mdp->num_rx_ring) - mdp->cur_rx; 1396 int boguscnt = (mdp->dirty_rx + mdp->num_rx_ring) - mdp->cur_rx;
1397 int limit; 1397 int limit;
1398 struct sk_buff *skb; 1398 struct sk_buff *skb;
1399 u16 pkt_len = 0;
1400 u32 desc_status; 1399 u32 desc_status;
1401 int skbuff_size = mdp->rx_buf_sz + SH_ETH_RX_ALIGN + 32 - 1; 1400 int skbuff_size = mdp->rx_buf_sz + SH_ETH_RX_ALIGN + 32 - 1;
1402 dma_addr_t dma_addr; 1401 dma_addr_t dma_addr;
1402 u16 pkt_len;
1403 u32 buf_len; 1403 u32 buf_len;
1404 1404
1405 boguscnt = min(boguscnt, *quota); 1405 boguscnt = min(boguscnt, *quota);
@@ -1778,7 +1778,7 @@ static int sh_eth_phy_init(struct net_device *ndev)
1778{ 1778{
1779 struct device_node *np = ndev->dev.parent->of_node; 1779 struct device_node *np = ndev->dev.parent->of_node;
1780 struct sh_eth_private *mdp = netdev_priv(ndev); 1780 struct sh_eth_private *mdp = netdev_priv(ndev);
1781 struct phy_device *phydev = NULL; 1781 struct phy_device *phydev;
1782 1782
1783 mdp->link = 0; 1783 mdp->link = 0;
1784 mdp->speed = 0; 1784 mdp->speed = 0;
@@ -2232,8 +2232,8 @@ static const struct ethtool_ops sh_eth_ethtool_ops = {
2232/* network device open function */ 2232/* network device open function */
2233static int sh_eth_open(struct net_device *ndev) 2233static int sh_eth_open(struct net_device *ndev)
2234{ 2234{
2235 int ret = 0;
2236 struct sh_eth_private *mdp = netdev_priv(ndev); 2235 struct sh_eth_private *mdp = netdev_priv(ndev);
2236 int ret;
2237 2237
2238 pm_runtime_get_sync(&mdp->pdev->dev); 2238 pm_runtime_get_sync(&mdp->pdev->dev);
2239 2239
@@ -2988,12 +2988,12 @@ static inline struct sh_eth_plat_data *sh_eth_parse_dt(struct device *dev)
2988 2988
2989static int sh_eth_drv_probe(struct platform_device *pdev) 2989static int sh_eth_drv_probe(struct platform_device *pdev)
2990{ 2990{
2991 int ret, devno = 0;
2992 struct resource *res; 2991 struct resource *res;
2993 struct net_device *ndev = NULL;
2994 struct sh_eth_private *mdp = NULL;
2995 struct sh_eth_plat_data *pd = dev_get_platdata(&pdev->dev); 2992 struct sh_eth_plat_data *pd = dev_get_platdata(&pdev->dev);
2996 const struct platform_device_id *id = platform_get_device_id(pdev); 2993 const struct platform_device_id *id = platform_get_device_id(pdev);
2994 struct sh_eth_private *mdp;
2995 struct net_device *ndev;
2996 int ret, devno;
2997 2997
2998 /* get base addr */ 2998 /* get base addr */
2999 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 2999 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);