diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-09-23 01:40:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-09-26 21:34:29 -0400 |
commit | 807540baae406c84dcb9c1c8ef07a56d2d2ae84a (patch) | |
tree | ccd5c2cb57710dd6b73cf8df11eedf67abc14ae4 /drivers/net/ibm_newemac | |
parent | cb4dfe562cac6fcb544df752e40c1d78000d0712 (diff) |
drivers/net: return operator cleanup
Change "return (EXPR);" to "return EXPR;"
return is not a function, parentheses are not required.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ibm_newemac')
-rw-r--r-- | drivers/net/ibm_newemac/core.c | 6 | ||||
-rw-r--r-- | drivers/net/ibm_newemac/core.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index 3506fd6ad726..3bdb4fa32064 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
@@ -2095,11 +2095,11 @@ static void *emac_dump_regs(struct emac_instance *dev, void *buf) | |||
2095 | if (emac_has_feature(dev, EMAC_FTR_EMAC4)) { | 2095 | if (emac_has_feature(dev, EMAC_FTR_EMAC4)) { |
2096 | hdr->version = EMAC4_ETHTOOL_REGS_VER; | 2096 | hdr->version = EMAC4_ETHTOOL_REGS_VER; |
2097 | memcpy_fromio(hdr + 1, dev->emacp, EMAC4_ETHTOOL_REGS_SIZE(dev)); | 2097 | memcpy_fromio(hdr + 1, dev->emacp, EMAC4_ETHTOOL_REGS_SIZE(dev)); |
2098 | return ((void *)(hdr + 1) + EMAC4_ETHTOOL_REGS_SIZE(dev)); | 2098 | return (void *)(hdr + 1) + EMAC4_ETHTOOL_REGS_SIZE(dev); |
2099 | } else { | 2099 | } else { |
2100 | hdr->version = EMAC_ETHTOOL_REGS_VER; | 2100 | hdr->version = EMAC_ETHTOOL_REGS_VER; |
2101 | memcpy_fromio(hdr + 1, dev->emacp, EMAC_ETHTOOL_REGS_SIZE(dev)); | 2101 | memcpy_fromio(hdr + 1, dev->emacp, EMAC_ETHTOOL_REGS_SIZE(dev)); |
2102 | return ((void *)(hdr + 1) + EMAC_ETHTOOL_REGS_SIZE(dev)); | 2102 | return (void *)(hdr + 1) + EMAC_ETHTOOL_REGS_SIZE(dev); |
2103 | } | 2103 | } |
2104 | } | 2104 | } |
2105 | 2105 | ||
@@ -2293,7 +2293,7 @@ static int __devinit emac_check_deps(struct emac_instance *dev, | |||
2293 | if (deps[i].drvdata != NULL) | 2293 | if (deps[i].drvdata != NULL) |
2294 | there++; | 2294 | there++; |
2295 | } | 2295 | } |
2296 | return (there == EMAC_DEP_COUNT); | 2296 | return there == EMAC_DEP_COUNT; |
2297 | } | 2297 | } |
2298 | 2298 | ||
2299 | static void emac_put_deps(struct emac_instance *dev) | 2299 | static void emac_put_deps(struct emac_instance *dev) |
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h index 9e37e3d9c51d..4fec0844d59d 100644 --- a/drivers/net/ibm_newemac/core.h +++ b/drivers/net/ibm_newemac/core.h | |||
@@ -410,7 +410,7 @@ static inline u32 *emac_xaht_base(struct emac_instance *dev) | |||
410 | else | 410 | else |
411 | offset = offsetof(struct emac_regs, u0.emac4.iaht1); | 411 | offset = offsetof(struct emac_regs, u0.emac4.iaht1); |
412 | 412 | ||
413 | return ((u32 *)((ptrdiff_t)p + offset)); | 413 | return (u32 *)((ptrdiff_t)p + offset); |
414 | } | 414 | } |
415 | 415 | ||
416 | static inline u32 *emac_gaht_base(struct emac_instance *dev) | 416 | static inline u32 *emac_gaht_base(struct emac_instance *dev) |
@@ -418,7 +418,7 @@ static inline u32 *emac_gaht_base(struct emac_instance *dev) | |||
418 | /* GAHT registers always come after an identical number of | 418 | /* GAHT registers always come after an identical number of |
419 | * IAHT registers. | 419 | * IAHT registers. |
420 | */ | 420 | */ |
421 | return (emac_xaht_base(dev) + EMAC_XAHT_REGS(dev)); | 421 | return emac_xaht_base(dev) + EMAC_XAHT_REGS(dev); |
422 | } | 422 | } |
423 | 423 | ||
424 | static inline u32 *emac_iaht_base(struct emac_instance *dev) | 424 | static inline u32 *emac_iaht_base(struct emac_instance *dev) |
@@ -426,7 +426,7 @@ static inline u32 *emac_iaht_base(struct emac_instance *dev) | |||
426 | /* IAHT registers always come before an identical number of | 426 | /* IAHT registers always come before an identical number of |
427 | * GAHT registers. | 427 | * GAHT registers. |
428 | */ | 428 | */ |
429 | return (emac_xaht_base(dev)); | 429 | return emac_xaht_base(dev); |
430 | } | 430 | } |
431 | 431 | ||
432 | /* Ethtool get_regs complex data. | 432 | /* Ethtool get_regs complex data. |