diff options
author | Márton Németh <nm127@freemail.hu> | 2008-06-15 03:52:30 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-06-28 10:23:35 -0400 |
commit | a9879c4fca9d93ccfb48d642421f3f6211eceec4 (patch) | |
tree | ef5190cdb14596f381cb0c7535463562cfb48f61 /drivers/net/8139too.c | |
parent | 818727badc14ce57dc099a075b05505d50b7956e (diff) |
8139too: some style cleanups
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>
Diffstat (limited to 'drivers/net/8139too.c')
-rw-r--r-- | drivers/net/8139too.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index b23a00c5b84f..0cd8e258f882 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
@@ -107,8 +107,8 @@ | |||
107 | #include <linux/mii.h> | 107 | #include <linux/mii.h> |
108 | #include <linux/completion.h> | 108 | #include <linux/completion.h> |
109 | #include <linux/crc32.h> | 109 | #include <linux/crc32.h> |
110 | #include <asm/io.h> | 110 | #include <linux/io.h> |
111 | #include <asm/uaccess.h> | 111 | #include <linux/uaccess.h> |
112 | #include <asm/irq.h> | 112 | #include <asm/irq.h> |
113 | 113 | ||
114 | #define RTL8139_DRIVER_NAME DRV_NAME " Fast Ethernet driver " DRV_VERSION | 114 | #define RTL8139_DRIVER_NAME DRV_NAME " Fast Ethernet driver " DRV_VERSION |
@@ -134,7 +134,7 @@ | |||
134 | 134 | ||
135 | #if RTL8139_DEBUG | 135 | #if RTL8139_DEBUG |
136 | /* note: prints function name for you */ | 136 | /* note: prints function name for you */ |
137 | # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) | 137 | # define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __func__ , ## args) |
138 | #else | 138 | #else |
139 | # define DPRINTK(fmt, args...) | 139 | # define DPRINTK(fmt, args...) |
140 | #endif | 140 | #endif |
@@ -145,7 +145,7 @@ | |||
145 | # define assert(expr) \ | 145 | # define assert(expr) \ |
146 | if(unlikely(!(expr))) { \ | 146 | if(unlikely(!(expr))) { \ |
147 | printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n", \ | 147 | printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n", \ |
148 | #expr,__FILE__,__FUNCTION__,__LINE__); \ | 148 | #expr, __FILE__, __func__, __LINE__); \ |
149 | } | 149 | } |
150 | #endif | 150 | #endif |
151 | 151 | ||
@@ -219,7 +219,7 @@ enum { | |||
219 | #define RTL8139B_IO_SIZE 256 | 219 | #define RTL8139B_IO_SIZE 256 |
220 | 220 | ||
221 | #define RTL8129_CAPS HAS_MII_XCVR | 221 | #define RTL8129_CAPS HAS_MII_XCVR |
222 | #define RTL8139_CAPS HAS_CHIP_XCVR|HAS_LNK_CHNG | 222 | #define RTL8139_CAPS (HAS_CHIP_XCVR|HAS_LNK_CHNG) |
223 | 223 | ||
224 | typedef enum { | 224 | typedef enum { |
225 | RTL8139 = 0, | 225 | RTL8139 = 0, |
@@ -1889,7 +1889,7 @@ static void rtl8139_rx_err (u32 rx_status, struct net_device *dev, | |||
1889 | } | 1889 | } |
1890 | 1890 | ||
1891 | #if RX_BUF_IDX == 3 | 1891 | #if RX_BUF_IDX == 3 |
1892 | static __inline__ void wrap_copy(struct sk_buff *skb, const unsigned char *ring, | 1892 | static inline void wrap_copy(struct sk_buff *skb, const unsigned char *ring, |
1893 | u32 offset, unsigned int size) | 1893 | u32 offset, unsigned int size) |
1894 | { | 1894 | { |
1895 | u32 left = RX_BUF_LEN - offset; | 1895 | u32 left = RX_BUF_LEN - offset; |