Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / net / ibm_newemac / core.h

diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h
index 9e37e3d9c51d778c072a5a7b417e6af743794944..4fec0844d59dffd34496428a900deb5d0641c3d4 100644 (file)
--- 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)
        else
                offset = offsetof(struct emac_regs, u0.emac4.iaht1);
 
-       return ((u32 *)((ptrdiff_t)p + offset));
+       return (u32 *)((ptrdiff_t)p + offset);
 }
 
 static inline u32 *emac_gaht_base(struct emac_instance *dev)
@@ -418,7 +418,7 @@ static inline u32 *emac_gaht_base(struct emac_instance *dev)
        /* GAHT registers always come after an identical number of
         * IAHT registers.
         */
-       return (emac_xaht_base(dev) + EMAC_XAHT_REGS(dev));
+       return emac_xaht_base(dev) + EMAC_XAHT_REGS(dev);
 }
 
 static inline u32 *emac_iaht_base(struct emac_instance *dev)
@@ -426,7 +426,7 @@ static inline u32 *emac_iaht_base(struct emac_instance *dev)
        /* IAHT registers always come before an identical number of
         * GAHT registers.
         */
-       return (emac_xaht_base(dev));
+       return emac_xaht_base(dev);
 }
 
 /* Ethtool get_regs complex data.