summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/8390/hydra.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-01-09 11:03:43 +0100
committerGeert Uytterhoeven <geert@linux-m68k.org>2013-11-26 11:09:07 +0100
commit6112ea0862facaeaeab504ee01c0d04bcd22daaf (patch)
tree22c2cb929cea94dd7decd0c1756e77684acdc95c /drivers/net/ethernet/8390/hydra.c
parent83b7bce3d390f15047e05a186bb4051536ee9dbc (diff)
downloadop-kernel-dev-6112ea0862facaeaeab504ee01c0d04bcd22daaf.zip
op-kernel-dev-6112ea0862facaeaeab504ee01c0d04bcd22daaf.tar.gz
zorro: ZTWO_VADDR() should return "void __iomem *"
ZTWO_VADDR() converts from physical to virtual I/O addresses, so it should return "void __iomem *" instead of "unsigned long". This allows to drop several casts, but requires adding a few casts to accomodate legacy driver frameworks that store "unsigned long" I/O addresses. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/net/ethernet/8390/hydra.c')
-rw-r--r--drivers/net/ethernet/8390/hydra.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/8390/hydra.c b/drivers/net/ethernet/8390/hydra.c
index fb3dd43..f615fde 100644
--- a/drivers/net/ethernet/8390/hydra.c
+++ b/drivers/net/ethernet/8390/hydra.c
@@ -113,7 +113,7 @@ static const struct net_device_ops hydra_netdev_ops = {
static int hydra_init(struct zorro_dev *z)
{
struct net_device *dev;
- unsigned long board = ZTWO_VADDR(z->resource.start);
+ unsigned long board = (unsigned long)ZTWO_VADDR(z->resource.start);
unsigned long ioaddr = board+HYDRA_NIC_BASE;
const char name[] = "NE2000";
int start_page, stop_page;
OpenPOWER on IntegriCloud