aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVarka Bhadram <varkab@cdac.in>2014-07-10 01:35:44 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-10 03:40:37 -0400
commit55064efd24d094fc3cb767535a3c5890276ec0bc (patch)
treef79603b924522c17376ac60e4abb7f5ed6993717
parent59329d8bc4c6b52a7f8d146fa782c6346bc409f0 (diff)
net: cpmac: fix proper spacing before return statement
This patch insert proper spaces before return statement. Signed-off-by: Varka Bhadram <varkab@cdac.in> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/ti/cpmac.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index 3d3ead4a0f6f..b6efe3e0f1ee 100644
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -283,6 +283,7 @@ static int cpmac_mdio_read(struct mii_bus *bus, int phy_id, int reg)
283 MDIO_PHY(phy_id)); 283 MDIO_PHY(phy_id));
284 while ((val = cpmac_read(bus->priv, CPMAC_MDIO_ACCESS(0))) & MDIO_BUSY) 284 while ((val = cpmac_read(bus->priv, CPMAC_MDIO_ACCESS(0))) & MDIO_BUSY)
285 cpu_relax(); 285 cpu_relax();
286
286 return MDIO_DATA(val); 287 return MDIO_DATA(val);
287} 288}
288 289
@@ -293,6 +294,7 @@ static int cpmac_mdio_write(struct mii_bus *bus, int phy_id,
293 cpu_relax(); 294 cpu_relax();
294 cpmac_write(bus->priv, CPMAC_MDIO_ACCESS(0), MDIO_BUSY | MDIO_WRITE | 295 cpmac_write(bus->priv, CPMAC_MDIO_ACCESS(0), MDIO_BUSY | MDIO_WRITE |
295 MDIO_REG(reg) | MDIO_PHY(phy_id) | MDIO_DATA(val)); 296 MDIO_REG(reg) | MDIO_PHY(phy_id) | MDIO_DATA(val));
297
296 return 0; 298 return 0;
297} 299}
298 300
@@ -308,6 +310,7 @@ static int cpmac_mdio_reset(struct mii_bus *bus)
308 ar7_device_reset(AR7_RESET_BIT_MDIO); 310 ar7_device_reset(AR7_RESET_BIT_MDIO);
309 cpmac_write(bus->priv, CPMAC_MDIO_CONTROL, MDIOC_ENABLE | 311 cpmac_write(bus->priv, CPMAC_MDIO_CONTROL, MDIOC_ENABLE |
310 MDIOC_CLKDIV(clk_get_rate(cpmac_clk) / 2200000 - 1)); 312 MDIOC_CLKDIV(clk_get_rate(cpmac_clk) / 2200000 - 1));
313
311 return 0; 314 return 0;
312} 315}
313 316
@@ -537,6 +540,7 @@ fatal_error:
537 cpmac_hw_stop(priv->dev); 540 cpmac_hw_stop(priv->dev);
538 if (!schedule_work(&priv->reset_work)) 541 if (!schedule_work(&priv->reset_work))
539 atomic_dec(&priv->reset_pending); 542 atomic_dec(&priv->reset_pending);
543
540 return 0; 544 return 0;
541 545
542} 546}
@@ -883,6 +887,7 @@ static int cpmac_set_ringparam(struct net_device *dev,
883 if (netif_running(dev)) 887 if (netif_running(dev))
884 return -EBUSY; 888 return -EBUSY;
885 priv->ring_size = ring->rx_pending; 889 priv->ring_size = ring->rx_pending;
890
886 return 0; 891 return 0;
887} 892}
888 893
@@ -1076,6 +1081,7 @@ static int cpmac_stop(struct net_device *dev)
1076 dma_free_coherent(&dev->dev, sizeof(struct cpmac_desc) * 1081 dma_free_coherent(&dev->dev, sizeof(struct cpmac_desc) *
1077 (CPMAC_QUEUES + priv->ring_size), 1082 (CPMAC_QUEUES + priv->ring_size),
1078 priv->desc_ring, priv->dma_ring); 1083 priv->desc_ring, priv->dma_ring);
1084
1079 return 0; 1085 return 0;
1080} 1086}
1081 1087
@@ -1178,6 +1184,7 @@ static int cpmac_probe(struct platform_device *pdev)
1178 "mac: %pM\n", (void *)mem->start, dev->irq, 1184 "mac: %pM\n", (void *)mem->start, dev->irq,
1179 priv->phy_name, dev->dev_addr); 1185 priv->phy_name, dev->dev_addr);
1180 } 1186 }
1187
1181 return 0; 1188 return 0;
1182 1189
1183fail: 1190fail:
@@ -1191,6 +1198,7 @@ static int cpmac_remove(struct platform_device *pdev)
1191 1198
1192 unregister_netdev(dev); 1199 unregister_netdev(dev);
1193 free_netdev(dev); 1200 free_netdev(dev);
1201
1194 return 0; 1202 return 0;
1195} 1203}
1196 1204