@@ -283,6 +283,7 @@ static int cpmac_mdio_read(struct mii_bus *bus, int phy_id, int reg)
283
283
MDIO_PHY (phy_id ));
284
284
while ((val = cpmac_read (bus -> priv , CPMAC_MDIO_ACCESS (0 ))) & MDIO_BUSY )
285
285
cpu_relax ();
286
+
286
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
294
cpu_relax ();
294
295
cpmac_write (bus -> priv , CPMAC_MDIO_ACCESS (0 ), MDIO_BUSY | MDIO_WRITE |
295
296
MDIO_REG (reg ) | MDIO_PHY (phy_id ) | MDIO_DATA (val ));
297
+
296
298
return 0 ;
297
299
}
298
300
@@ -308,6 +310,7 @@ static int cpmac_mdio_reset(struct mii_bus *bus)
308
310
ar7_device_reset (AR7_RESET_BIT_MDIO );
309
311
cpmac_write (bus -> priv , CPMAC_MDIO_CONTROL , MDIOC_ENABLE |
310
312
MDIOC_CLKDIV (clk_get_rate (cpmac_clk ) / 2200000 - 1 ));
313
+
311
314
return 0 ;
312
315
}
313
316
@@ -537,6 +540,7 @@ static int cpmac_poll(struct napi_struct *napi, int budget)
537
540
cpmac_hw_stop (priv -> dev );
538
541
if (!schedule_work (& priv -> reset_work ))
539
542
atomic_dec (& priv -> reset_pending );
543
+
540
544
return 0 ;
541
545
542
546
}
@@ -883,6 +887,7 @@ static int cpmac_set_ringparam(struct net_device *dev,
883
887
if (netif_running (dev ))
884
888
return - EBUSY ;
885
889
priv -> ring_size = ring -> rx_pending ;
890
+
886
891
return 0 ;
887
892
}
888
893
@@ -1076,6 +1081,7 @@ static int cpmac_stop(struct net_device *dev)
1076
1081
dma_free_coherent (& dev -> dev , sizeof (struct cpmac_desc ) *
1077
1082
(CPMAC_QUEUES + priv -> ring_size ),
1078
1083
priv -> desc_ring , priv -> dma_ring );
1084
+
1079
1085
return 0 ;
1080
1086
}
1081
1087
@@ -1178,6 +1184,7 @@ static int cpmac_probe(struct platform_device *pdev)
1178
1184
"mac: %pM\n" , (void * )mem -> start , dev -> irq ,
1179
1185
priv -> phy_name , dev -> dev_addr );
1180
1186
}
1187
+
1181
1188
return 0 ;
1182
1189
1183
1190
fail :
@@ -1191,6 +1198,7 @@ static int cpmac_remove(struct platform_device *pdev)
1191
1198
1192
1199
unregister_netdev (dev );
1193
1200
free_netdev (dev );
1201
+
1194
1202
return 0 ;
1195
1203
}
1196
1204
0 commit comments