diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/myri10ge/myri10ge.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 81f127a78afa..1e62f58ed2c2 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
@@ -273,9 +273,9 @@ MODULE_PARM_DESC(myri10ge_debug, "Debug level (0=none,...,16=all)"); | |||
273 | 273 | ||
274 | #define myri10ge_pio_copy(to,from,size) __iowrite64_copy(to,from,size/8) | 274 | #define myri10ge_pio_copy(to,from,size) __iowrite64_copy(to,from,size/8) |
275 | 275 | ||
276 | static inline void put_be32(__be32 val, __be32 __iomem *p) | 276 | static inline void put_be32(__be32 val, __be32 __iomem * p) |
277 | { | 277 | { |
278 | __raw_writel((__force __u32)val, (__force void __iomem *)p); | 278 | __raw_writel((__force __u32) val, (__force void __iomem *)p); |
279 | } | 279 | } |
280 | 280 | ||
281 | static int | 281 | static int |
@@ -2206,7 +2206,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev) | |||
2206 | struct myri10ge_cmd cmd; | 2206 | struct myri10ge_cmd cmd; |
2207 | struct myri10ge_priv *mgp; | 2207 | struct myri10ge_priv *mgp; |
2208 | struct dev_mc_list *mc_list; | 2208 | struct dev_mc_list *mc_list; |
2209 | __be32 data[2] = {0, 0}; | 2209 | __be32 data[2] = { 0, 0 }; |
2210 | int err; | 2210 | int err; |
2211 | 2211 | ||
2212 | mgp = netdev_priv(dev); | 2212 | mgp = netdev_priv(dev); |
@@ -2625,7 +2625,7 @@ static u32 myri10ge_read_reboot(struct myri10ge_priv *mgp) | |||
2625 | static void myri10ge_watchdog(struct work_struct *work) | 2625 | static void myri10ge_watchdog(struct work_struct *work) |
2626 | { | 2626 | { |
2627 | struct myri10ge_priv *mgp = | 2627 | struct myri10ge_priv *mgp = |
2628 | container_of(work, struct myri10ge_priv, watchdog_work); | 2628 | container_of(work, struct myri10ge_priv, watchdog_work); |
2629 | u32 reboot; | 2629 | u32 reboot; |
2630 | int status; | 2630 | int status; |
2631 | u16 cmd, vendor; | 2631 | u16 cmd, vendor; |