summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-01-04 08:59:38 +0000
committerDavid S. Miller <davem@davemloft.net>2012-01-04 15:55:53 -0500
commit48529680dc59061eaa13ea3b1047401612b79600 (patch)
tree614a5637afd5c9ce6f5739fa0ddeaf67b2c50ff4 /drivers/net
parent853d5dc95b41babb7001934becad9c944738d8e3 (diff)
downloadlinux-48529680dc59061eaa13ea3b1047401612b79600.tar.bz2
r6040: place comments before code
checkpatch.pl complained about the line exceding 80 columns, and the comment was actually on the same line as the code, fix that. Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/rdc/r6040.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index b8dc7276adac..87aa43935070 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -735,9 +735,10 @@ static void r6040_mac_address(struct net_device *dev)
void __iomem *ioaddr = lp->base;
u16 *adrp;
- /* MAC operation register */
- iowrite16(MAC_RST, ioaddr + MCR1); /* Reset MAC */
- iowrite16(MAC_SM_RST, ioaddr + MAC_SM); /* Reset internal state machine */
+ /* Reset MAC */
+ iowrite16(MAC_RST, ioaddr + MCR1);
+ /* Reset internal state machine */
+ iowrite16(MAC_SM_RST, ioaddr + MAC_SM);
iowrite16(0, ioaddr + MAC_SM);
mdelay(5);