8139too: different style cleanups

PATCH In review Németh Márton 3 participants 5 messages Jun 14, 2008 – Jun 16, 2008

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Németh Márton

author

2008-06-14 12:37 UTC #0 lore raw

PATCH 2/2 8139too: different style cleanups

From: Márton Németh <[email protected]>

Clean up the following errors and warnings reported by checkpatch.pl:
- Use #include <linux/io.h> instead of <asm/io.h>
- Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
- __func__ should be used instead of gcc specific __FUNCTION__
- Macros with complex values should be enclosed in parenthesis
- do not add new typedefs
- trailing statements should be on next line
- braces {} are not necessary for single statement blocks
- plain inline is preferred over __inline__

Signed-off-by Márton Németh <[email protected]>

---

drivers/net/8139too.c +11 ~~-10~~

@@ -107,8 +107,8 @@
 #include <linux/mii.h>
 #include <linux/completion.h>
 #include <linux/crc32.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
 #include <asm/irq.h>
 
 #define RTL8139_DRIVER_NAME   DRV_NAME " Fast Ethernet driver " DRV_VERSION

@@ -135,7 +135,7 @@
 #if RTL8139_DEBUG
 /* note: prints function name for you */
 #  define DPRINTK(fmt, args...) \
-	printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
+	printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
 #else
 #  define DPRINTK(fmt, args...)
 #endif

@@ -146,7 +146,7 @@
 #  define assert(expr) \
 	if (unlikely(!(expr))) {					\
 		printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n",	\
-		       #expr, __FILE__, __FUNCTION__, __LINE__);	\
+		       #expr, __FILE__, __func__, __LINE__);	\
 	}
 #endif

@@ -221,9 +221,9 @@ enum {
 #define RTL8139B_IO_SIZE 256
 
 #define RTL8129_CAPS	HAS_MII_XCVR
-#define RTL8139_CAPS	HAS_CHIP_XCVR|HAS_LNK_CHNG
+#define RTL8139_CAPS	(HAS_CHIP_XCVR|HAS_LNK_CHNG)
 
-typedef enum {
+enum {
 	RTL8139 = 0,
 	RTL8129,
 } board_t;

@@ -1033,7 +1033,8 @@ static int __devinit rtl8139_init_one(st
 	/* dev is fully set up and ready to use now */
 	DPRINTK("about to register device named %s (%p)...\n", dev->name, dev);
 	i = register_netdev(dev);
-	if (i) goto err_out;
+	if (i)
+		goto err_out;
 
 	pci_set_drvdata(pdev, dev);

@@ -1378,9 +1379,9 @@ static void rtl_check_media(struct net_d
 {
 	struct rtl8139_private *tp = netdev_priv(dev);
 
-	if (tp->phys[0] >= 0) {
+	if (tp->phys[0] >= 0)
 		mii_check_media(&tp->mii, netif_msg_link(tp), init_media);
-	}
+
 }
 
 /* Start the hardware at open or resume. */

@@ -1921,7 +1922,7 @@ static void rtl8139_rx_err(u32 rx_status
 }
 
 #if RX_BUF_IDX == 3
-static __inline__ void wrap_copy(struct sk_buff *skb, const unsigned char *ring,
+static inline void wrap_copy(struct sk_buff *skb, const unsigned char *ring,
 				 u32 offset, unsigned int size)
 {
 	u32 left = RX_BUF_LEN - offset;

Németh Márton

author

2008-06-14 18:44 UTC #1 lore raw

From: Márton Németh <[email protected]>

Signed-off-by Márton Németh <[email protected]>

---

drivers/net/8139too.c +11 ~~-10~~

@@ -107,8 +107,8 @@
 #include <linux/mii.h>
 #include <linux/completion.h>
 #include <linux/crc32.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
 #include <asm/irq.h>
 
 #define RTL8139_DRIVER_NAME   DRV_NAME " Fast Ethernet driver " DRV_VERSION

@@ -135,7 +135,7 @@
 #if RTL8139_DEBUG
 /* note: prints function name for you */
 #  define DPRINTK(fmt, args...) \
-	printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
+	printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
 #else
 #  define DPRINTK(fmt, args...)
 #endif

@@ -146,7 +146,7 @@
 #  define assert(expr) \
 	if (unlikely(!(expr))) {					\
 		printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n",	\
-		       #expr, __FILE__, __FUNCTION__, __LINE__);	\
+		       #expr, __FILE__, __func__, __LINE__);	\
 	}
 #endif

@@ -222,9 +222,9 @@ enum {
 #define RTL8139B_IO_SIZE 256
 
 #define RTL8129_CAPS	HAS_MII_XCVR
-#define RTL8139_CAPS	HAS_CHIP_XCVR|HAS_LNK_CHNG
+#define RTL8139_CAPS	(HAS_CHIP_XCVR|HAS_LNK_CHNG)
 
-typedef enum {
+enum {
 	RTL8139 = 0,
 	RTL8129,
 } board_t;

@@ -1035,7 +1035,8 @@ static int __devinit rtl8139_init_one(st
 	/* dev is fully set up and ready to use now */
 	DPRINTK("about to register device named %s (%p)...\n", dev->name, dev);
 	i = register_netdev(dev);
-	if (i) goto err_out;
+	if (i)
+		goto err_out;
 
 	pci_set_drvdata(pdev, dev);

@@ -1380,9 +1381,9 @@ static void rtl_check_media(struct net_d
 {
 	struct rtl8139_private *tp = netdev_priv(dev);
 
-	if (tp->phys[0] >= 0) {
+	if (tp->phys[0] >= 0)
 		mii_check_media(&tp->mii, netif_msg_link(tp), init_media);
-	}
+
 }
 
 /* Start the hardware at open or resume. */

@@ -1923,7 +1924,7 @@ static void rtl8139_rx_err(u32 rx_status
 }
 
 #if RX_BUF_IDX == 3
-static __inline__ void wrap_copy(struct sk_buff *skb, const unsigned char *ring,
+static inline void wrap_copy(struct sk_buff *skb, const unsigned char *ring,
 				 u32 offset, unsigned int size)
 {
 	u32 left = RX_BUF_LEN - offset;

David Newall

2008-06-15 06:26 UTC #2 lore raw

drivers/net/8139too.c line 138

Quoted 4 lines · Németh Márton

# define DPRINTK(fmt, args...) \
drivers/net/8139too.c +1 -1
-	printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
+	printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)

Why change __FUNCTION__ to __func__? I don't even know where __func__ come from? Assuming that it isn't totally broken, and I'll believe that
it isn't, then would it be compiler-specific? __FUNCTION__ is standard
and that's more than enough reason to prefer that form to any non-standard variation.

Yes to the following; no to all the rest:

Quoted 2 lines

drivers/net/8139too.c +1 -1

-#define RTL8139_CAPS	HAS_CHIP_XCVR|HAS_LNK_CHNG
+#define RTL8139_CAPS	(HAS_CHIP_XCVR|HAS_LNK_CHNG)

Harvey Harrison

2008-06-15 06:50 UTC #3 lore raw

Quoted 11 lines · David Newall

drivers/net/8139too.c line 138
Quoted 4 lines · Németh Márton
# define DPRINTK(fmt, args...) \
drivers/net/8139too.c +1 -1
-	printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
+	printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
Why change __FUNCTION__ to __func__? I don't even know where __func__ come from? Assuming that it isn't totally broken, and I'll believe that
it isn't, then would it be compiler-specific? __FUNCTION__ is standard
and that's more than enough reason to prefer that form to any non-standard variation.

__FUNCTION__ is gcc-specific, __func__ is C99.

Harvey

Németh Márton

author

2008-06-16 05:09 UTC #4 lore raw

PATCH 1/1 8139too: add missing brackets

In reply to David Newall

From: Márton Németh <[email protected]>

Clean up the following error reported by checkpatch.pl:
- Macros with complex values should be enclosed in parenthesis

The macro RTL8139_CAPS currently only used as a whole expression to initialize board_info[] so this change won't change the resulting code.

Signed-off-by Márton Németh <[email protected]>

---

drivers/net/8139too.c +1 -1

@@ -219,7 +219,7 @@ enum {
 #define RTL8139B_IO_SIZE 256
 
 #define RTL8129_CAPS	HAS_MII_XCVR
-#define RTL8139_CAPS	HAS_CHIP_XCVR|HAS_LNK_CHNG
+#define RTL8139_CAPS	(HAS_CHIP_XCVR|HAS_LNK_CHNG)
 
 typedef enum {
 	RTL8139 = 0,