aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ibm_newemac/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ibm_newemac/core.c')
-rw-r--r--drivers/net/ibm_newemac/core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 3506fd6ad72..3bdb4fa3206 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
2299static void emac_put_deps(struct emac_instance *dev) 2299static void emac_put_deps(struct emac_instance *dev)