8139too: some style cleanups (a9879c4f) · Commits · 戴 / test

Clean up the following errors and warnings reported by checkpatch.pl: + ERROR: Macros with complex values should be enclosed in parenthesis + WARNING: __func__ should be used instead of gcc specific __FUNCTION__ + WARNING: plain inline is preferred over __inline__ + WARNING: Use #include <linux/io.h> instead of <asm/io.h> + WARNING: Use #include <linux/uaccess.h> instead of <asm/uaccess.h> The changes were verified with by comparing the "objdump -d 8139too.ko" output which is exactly the same for the old and new version in case of config CONFIG_8139TOO=m, CONFIG_8139TOO_PIO=n, CONFIG_8139TOO_TUNE_TWISTER=n, CONFIG_8139TOO_8129=n, CONFIG_8139_OLD_RX_RESET=n. Software versions used: gcc 4.2.3, objdump 2.18.0.20080103, on elf32-i386. Signed-off-by:

Márton Németh <nm127@freemail.hu> Signed-off-by:

Jeff Garzik <jgarzik@redhat.com>

drivers/net/8139too.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -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
		@@ -134,7 +134,7 @@

		#if RTL8139_DEBUG
		/* note: prints function name for you */
		# define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args)
		# define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args)
		#else
		# define DPRINTK(fmt, args...)
		#endif
		@@ -145,7 +145,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

		@@ -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,
		@@ -1889,7 +1889,7 @@ static void rtl8139_rx_err (u32 rx_status, struct net_device *dev,
		}

		#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;

Admin message