diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-01-09 05:03:43 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-26 05:09:07 -0500 |
commit | 6112ea0862facaeaeab504ee01c0d04bcd22daaf (patch) | |
tree | 22c2cb929cea94dd7decd0c1756e77684acdc95c /drivers/net/ethernet/8390/zorro8390.c | |
parent | 83b7bce3d390f15047e05a186bb4051536ee9dbc (diff) |
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/zorro8390.c')
-rw-r--r-- | drivers/net/ethernet/8390/zorro8390.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/8390/zorro8390.c b/drivers/net/ethernet/8390/zorro8390.c index 85ec4c2d2645..ae2a12b7db62 100644 --- a/drivers/net/ethernet/8390/zorro8390.c +++ b/drivers/net/ethernet/8390/zorro8390.c | |||
@@ -287,7 +287,7 @@ static const struct net_device_ops zorro8390_netdev_ops = { | |||
287 | }; | 287 | }; |
288 | 288 | ||
289 | static int zorro8390_init(struct net_device *dev, unsigned long board, | 289 | static int zorro8390_init(struct net_device *dev, unsigned long board, |
290 | const char *name, unsigned long ioaddr) | 290 | const char *name, void __iomem *ioaddr) |
291 | { | 291 | { |
292 | int i; | 292 | int i; |
293 | int err; | 293 | int err; |
@@ -354,7 +354,7 @@ static int zorro8390_init(struct net_device *dev, unsigned long board, | |||
354 | start_page = NESM_START_PG; | 354 | start_page = NESM_START_PG; |
355 | stop_page = NESM_STOP_PG; | 355 | stop_page = NESM_STOP_PG; |
356 | 356 | ||
357 | dev->base_addr = ioaddr; | 357 | dev->base_addr = (unsigned long)ioaddr; |
358 | dev->irq = IRQ_AMIGA_PORTS; | 358 | dev->irq = IRQ_AMIGA_PORTS; |
359 | 359 | ||
360 | /* Install the Interrupt handler */ | 360 | /* Install the Interrupt handler */ |