Commit 55064efd authored by Varka Bhadram's avatar Varka Bhadram Committed by David S. Miller

net: cpmac: fix proper spacing before return statement

This patch insert proper spaces before return statement.
Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59329d8b
...@@ -283,6 +283,7 @@ static int cpmac_mdio_read(struct mii_bus *bus, int phy_id, int reg) ...@@ -283,6 +283,7 @@ static int cpmac_mdio_read(struct mii_bus *bus, int phy_id, int reg)
MDIO_PHY(phy_id)); MDIO_PHY(phy_id));
while ((val = cpmac_read(bus->priv, CPMAC_MDIO_ACCESS(0))) & MDIO_BUSY) while ((val = cpmac_read(bus->priv, CPMAC_MDIO_ACCESS(0))) & MDIO_BUSY)
cpu_relax(); cpu_relax();
return MDIO_DATA(val); return MDIO_DATA(val);
} }
...@@ -293,6 +294,7 @@ static int cpmac_mdio_write(struct mii_bus *bus, int phy_id, ...@@ -293,6 +294,7 @@ static int cpmac_mdio_write(struct mii_bus *bus, int phy_id,
cpu_relax(); cpu_relax();
cpmac_write(bus->priv, CPMAC_MDIO_ACCESS(0), MDIO_BUSY | MDIO_WRITE | cpmac_write(bus->priv, CPMAC_MDIO_ACCESS(0), MDIO_BUSY | MDIO_WRITE |
MDIO_REG(reg) | MDIO_PHY(phy_id) | MDIO_DATA(val)); MDIO_REG(reg) | MDIO_PHY(phy_id) | MDIO_DATA(val));
return 0; return 0;
} }
...@@ -308,6 +310,7 @@ static int cpmac_mdio_reset(struct mii_bus *bus) ...@@ -308,6 +310,7 @@ static int cpmac_mdio_reset(struct mii_bus *bus)
ar7_device_reset(AR7_RESET_BIT_MDIO); ar7_device_reset(AR7_RESET_BIT_MDIO);
cpmac_write(bus->priv, CPMAC_MDIO_CONTROL, MDIOC_ENABLE | cpmac_write(bus->priv, CPMAC_MDIO_CONTROL, MDIOC_ENABLE |
MDIOC_CLKDIV(clk_get_rate(cpmac_clk) / 2200000 - 1)); MDIOC_CLKDIV(clk_get_rate(cpmac_clk) / 2200000 - 1));
return 0; return 0;
} }
...@@ -537,6 +540,7 @@ static int cpmac_poll(struct napi_struct *napi, int budget) ...@@ -537,6 +540,7 @@ static int cpmac_poll(struct napi_struct *napi, int budget)
cpmac_hw_stop(priv->dev); cpmac_hw_stop(priv->dev);
if (!schedule_work(&priv->reset_work)) if (!schedule_work(&priv->reset_work))
atomic_dec(&priv->reset_pending); atomic_dec(&priv->reset_pending);
return 0; return 0;
} }
...@@ -883,6 +887,7 @@ static int cpmac_set_ringparam(struct net_device *dev, ...@@ -883,6 +887,7 @@ static int cpmac_set_ringparam(struct net_device *dev,
if (netif_running(dev)) if (netif_running(dev))
return -EBUSY; return -EBUSY;
priv->ring_size = ring->rx_pending; priv->ring_size = ring->rx_pending;
return 0; return 0;
} }
...@@ -1076,6 +1081,7 @@ static int cpmac_stop(struct net_device *dev) ...@@ -1076,6 +1081,7 @@ static int cpmac_stop(struct net_device *dev)
dma_free_coherent(&dev->dev, sizeof(struct cpmac_desc) * dma_free_coherent(&dev->dev, sizeof(struct cpmac_desc) *
(CPMAC_QUEUES + priv->ring_size), (CPMAC_QUEUES + priv->ring_size),
priv->desc_ring, priv->dma_ring); priv->desc_ring, priv->dma_ring);
return 0; return 0;
} }
...@@ -1178,6 +1184,7 @@ static int cpmac_probe(struct platform_device *pdev) ...@@ -1178,6 +1184,7 @@ static int cpmac_probe(struct platform_device *pdev)
"mac: %pM\n", (void *)mem->start, dev->irq, "mac: %pM\n", (void *)mem->start, dev->irq,
priv->phy_name, dev->dev_addr); priv->phy_name, dev->dev_addr);
} }
return 0; return 0;
fail: fail:
...@@ -1191,6 +1198,7 @@ static int cpmac_remove(struct platform_device *pdev) ...@@ -1191,6 +1198,7 @@ static int cpmac_remove(struct platform_device *pdev)
unregister_netdev(dev); unregister_netdev(dev);
free_netdev(dev); free_netdev(dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment