Home » Mailing list archives » linux-netdev » 2010 » August » 8

[PATCH] cpmac: fix all checkpatch errors and warnings

Previous thread: [PATCH] r6040: fix all checkpatch errors and warnings by Florian Fainelli on Sunday, August 8, 2010 - 1:08 pm. (2 messages)

Next thread: [net-2.6 PATCH] ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG by Jeff Kirsher on Sunday, August 8, 2010 - 6:46 pm. (2 messages)
[view original message]
From: Florian Fainelli
Subject: [PATCH] cpmac: fix all checkpatch errors and warnings
Date: Sunday, August 8, 2010 - 1:09 pm

This patches fixes a couple of checkpatch warnings and errors:
- lines over 80 columns
- printk() instead of pr_cont()
- assignments in tests (if ((foo == bar())))

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index e1f6156..fe017eb 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -38,7 +38,7 @@
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/clk.h>
-#include <asm/gpio.h>
+#include <linux/gpio.h>
 #include <asm/atomic.h>
 
 MODULE_AUTHOR("Eugene Konev <ejka@imfi.kspu.ru>");
@@ -108,7 +108,7 @@ MODULE_PARM_DESC(dumb_switch, "Assume switch is not connected to MDIO bus");
 #define CPMAC_RX_INT_CLEAR		0x019c
 #define CPMAC_MAC_INT_ENABLE		0x01a8
 #define CPMAC_MAC_INT_CLEAR		0x01ac
-#define CPMAC_MAC_ADDR_LO(channel) 	(0x01b0 + (channel) * 4)
+#define CPMAC_MAC_ADDR_LO(channel)	(0x01b0 + (channel) * 4)
 #define CPMAC_MAC_ADDR_MID		0x01d0
 #define CPMAC_MAC_ADDR_HI		0x01d4
 #define CPMAC_MAC_HASH_LO		0x01d8
@@ -227,7 +227,7 @@ static void cpmac_dump_regs(struct net_device *dev)
 	for (i = 0; i < CPMAC_REG_END; i += 4) {
 		if (i % 16 == 0) {
 			if (i)
-				printk("\n");
+				pr_cont("\n");
 			printk(KERN_DEBUG "%s: reg[%p]:", dev->name,
 			       priv->regs + i);
 		}
@@ -262,7 +262,7 @@ static void cpmac_dump_skb(struct net_device *dev, struct sk_buff *skb)
 	for (i = 0; i < skb->len; i++) {
 		if (i % 16 == 0) {
 			if (i)
-				printk("\n");
+				pr_cont("\n");
 			printk(KERN_DEBUG "%s: data[%p]:", dev->name,
 			       skb->data + i);
 		}
@@ -873,7 +873,8 @@ static int cpmac_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 	return -EINVAL;
 }
 
-static void cpmac_get_ringparam(struct net_device *dev, struct ethtool_ringparam* ring)
+static void cpmac_get_ringparam(struct net_device *dev,
+						struct ethtool_ringparam *ring)
 {
 	struct cpmac_priv *priv = netdev_priv(dev);
 
@@ -888,7 +889,8 @@ static void ...
[ message continues ]
[view original message]
From: David Miller
Subject: Re: [PATCH] cpmac: fix all checkpatch errors and warnings
Date: Tuesday, August 17, 2010 - 2:35 am

From: Florian Fainelli <florian@openwrt.org>

Applied.
--


[ message continues ]
Previous thread: [PATCH] r6040: fix all checkpatch errors and warnings by Florian Fainelli on Sunday, August 8, 2010 - 1:08 pm. (2 messages)

Next thread: [net-2.6 PATCH] ixgbe: fix build error with FCOE_CONFIG without DCB_CONFIG by Jeff Kirsher on Sunday, August 8, 2010 - 6:46 pm. (2 messages)