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>
This commit is contained in:
@@ -713,8 +713,8 @@ static int a2065_init_one(struct zorro_dev *z,
|
||||
dev->dev_addr[3] = (z->rom.er_SerialNumber >> 16) & 0xff;
|
||||
dev->dev_addr[4] = (z->rom.er_SerialNumber >> 8) & 0xff;
|
||||
dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff;
|
||||
dev->base_addr = ZTWO_VADDR(base_addr);
|
||||
dev->mem_start = ZTWO_VADDR(mem_start);
|
||||
dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr);
|
||||
dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start);
|
||||
dev->mem_end = dev->mem_start + A2065_RAM_SIZE;
|
||||
|
||||
priv->ll = (volatile struct lance_regs *)dev->base_addr;
|
||||
|
@@ -747,8 +747,8 @@ static int ariadne_init_one(struct zorro_dev *z,
|
||||
dev->dev_addr[3] = (z->rom.er_SerialNumber >> 16) & 0xff;
|
||||
dev->dev_addr[4] = (z->rom.er_SerialNumber >> 8) & 0xff;
|
||||
dev->dev_addr[5] = z->rom.er_SerialNumber & 0xff;
|
||||
dev->base_addr = ZTWO_VADDR(base_addr);
|
||||
dev->mem_start = ZTWO_VADDR(mem_start);
|
||||
dev->base_addr = (unsigned long)ZTWO_VADDR(base_addr);
|
||||
dev->mem_start = (unsigned long)ZTWO_VADDR(mem_start);
|
||||
dev->mem_end = dev->mem_start + ARIADNE_RAM_SIZE;
|
||||
|
||||
dev->netdev_ops = &ariadne_netdev_ops;
|
||||
|
Reference in New Issue
Block a user