diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2010-04-12 02:58:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-13 05:25:46 -0400 |
commit | de6f31eb9a467cfd0f1f8c5e6ca842563f7f2870 (patch) | |
tree | c86e85b2756d0f1e343324cff27a6231cd5e7e5e /drivers | |
parent | 04380d401ebd02ec68bb0fc170f21a93690ebc80 (diff) |
tg3: Remove function errors flagged by checkpatch
This patch removes the following checkpatch errors:
* return is not a function, parentheses are not required
* space prohibited between function name and open parenthesis '('
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/tg3.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index a331ec51ebc2..3f8feb11787f 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -383,7 +383,7 @@ static void tg3_write32(struct tg3 *tp, u32 off, u32 val) | |||
383 | 383 | ||
384 | static u32 tg3_read32(struct tg3 *tp, u32 off) | 384 | static u32 tg3_read32(struct tg3 *tp, u32 off) |
385 | { | 385 | { |
386 | return (readl(tp->regs + off)); | 386 | return readl(tp->regs + off); |
387 | } | 387 | } |
388 | 388 | ||
389 | static void tg3_ape_write32(struct tg3 *tp, u32 off, u32 val) | 389 | static void tg3_ape_write32(struct tg3 *tp, u32 off, u32 val) |
@@ -393,7 +393,7 @@ static void tg3_ape_write32(struct tg3 *tp, u32 off, u32 val) | |||
393 | 393 | ||
394 | static u32 tg3_ape_read32(struct tg3 *tp, u32 off) | 394 | static u32 tg3_ape_read32(struct tg3 *tp, u32 off) |
395 | { | 395 | { |
396 | return (readl(tp->aperegs + off)); | 396 | return readl(tp->aperegs + off); |
397 | } | 397 | } |
398 | 398 | ||
399 | static void tg3_write_indirect_reg32(struct tg3 *tp, u32 off, u32 val) | 399 | static void tg3_write_indirect_reg32(struct tg3 *tp, u32 off, u32 val) |
@@ -511,7 +511,7 @@ static void tg3_write32_tx_mbox(struct tg3 *tp, u32 off, u32 val) | |||
511 | 511 | ||
512 | static u32 tg3_read32_mbox_5906(struct tg3 *tp, u32 off) | 512 | static u32 tg3_read32_mbox_5906(struct tg3 *tp, u32 off) |
513 | { | 513 | { |
514 | return (readl(tp->regs + off + GRCMBOX_BASE)); | 514 | return readl(tp->regs + off + GRCMBOX_BASE); |
515 | } | 515 | } |
516 | 516 | ||
517 | static void tg3_write32_mbox_5906(struct tg3 *tp, u32 off, u32 val) | 517 | static void tg3_write32_mbox_5906(struct tg3 *tp, u32 off, u32 val) |
@@ -5775,7 +5775,7 @@ static netdev_tx_t tg3_start_xmit_dma_bug(struct sk_buff *skb, | |||
5775 | hdr_len = ip_tcp_len + tcp_opt_len; | 5775 | hdr_len = ip_tcp_len + tcp_opt_len; |
5776 | if (unlikely((ETH_HLEN + hdr_len) > 80) && | 5776 | if (unlikely((ETH_HLEN + hdr_len) > 80) && |
5777 | (tp->tg3_flags2 & TG3_FLG2_TSO_BUG)) | 5777 | (tp->tg3_flags2 & TG3_FLG2_TSO_BUG)) |
5778 | return (tg3_tso_bug(tp, skb)); | 5778 | return tg3_tso_bug(tp, skb); |
5779 | 5779 | ||
5780 | base_flags |= (TXD_FLAG_CPU_PRE_DMA | | 5780 | base_flags |= (TXD_FLAG_CPU_PRE_DMA | |
5781 | TXD_FLAG_CPU_POST_DMA); | 5781 | TXD_FLAG_CPU_POST_DMA); |
@@ -9285,10 +9285,10 @@ static void __tg3_set_rx_mode(struct net_device *dev) | |||
9285 | rx_mode |= RX_MODE_PROMISC; | 9285 | rx_mode |= RX_MODE_PROMISC; |
9286 | } else if (dev->flags & IFF_ALLMULTI) { | 9286 | } else if (dev->flags & IFF_ALLMULTI) { |
9287 | /* Accept all multicast. */ | 9287 | /* Accept all multicast. */ |
9288 | tg3_set_multi (tp, 1); | 9288 | tg3_set_multi(tp, 1); |
9289 | } else if (netdev_mc_empty(dev)) { | 9289 | } else if (netdev_mc_empty(dev)) { |
9290 | /* Reject all multicast. */ | 9290 | /* Reject all multicast. */ |
9291 | tg3_set_multi (tp, 0); | 9291 | tg3_set_multi(tp, 0); |
9292 | } else { | 9292 | } else { |
9293 | /* Accept one or more multicast(s). */ | 9293 | /* Accept one or more multicast(s). */ |
9294 | struct netdev_hw_addr *ha; | 9294 | struct netdev_hw_addr *ha; |
@@ -10030,7 +10030,7 @@ static int tg3_set_tx_csum(struct net_device *dev, u32 data) | |||
10030 | return 0; | 10030 | return 0; |
10031 | } | 10031 | } |
10032 | 10032 | ||
10033 | static int tg3_get_sset_count (struct net_device *dev, int sset) | 10033 | static int tg3_get_sset_count(struct net_device *dev, int sset) |
10034 | { | 10034 | { |
10035 | switch (sset) { | 10035 | switch (sset) { |
10036 | case ETH_SS_TEST: | 10036 | case ETH_SS_TEST: |
@@ -10042,7 +10042,7 @@ static int tg3_get_sset_count (struct net_device *dev, int sset) | |||
10042 | } | 10042 | } |
10043 | } | 10043 | } |
10044 | 10044 | ||
10045 | static void tg3_get_strings (struct net_device *dev, u32 stringset, u8 *buf) | 10045 | static void tg3_get_strings(struct net_device *dev, u32 stringset, u8 *buf) |
10046 | { | 10046 | { |
10047 | switch (stringset) { | 10047 | switch (stringset) { |
10048 | case ETH_SS_STATS: | 10048 | case ETH_SS_STATS: |
@@ -10089,7 +10089,7 @@ static int tg3_phys_id(struct net_device *dev, u32 data) | |||
10089 | return 0; | 10089 | return 0; |
10090 | } | 10090 | } |
10091 | 10091 | ||
10092 | static void tg3_get_ethtool_stats (struct net_device *dev, | 10092 | static void tg3_get_ethtool_stats(struct net_device *dev, |
10093 | struct ethtool_stats *estats, u64 *tmp_stats) | 10093 | struct ethtool_stats *estats, u64 *tmp_stats) |
10094 | { | 10094 | { |
10095 | struct tg3 *tp = netdev_priv(dev); | 10095 | struct tg3 *tp = netdev_priv(dev); |