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>
这个提交包含在:
@@ -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;
|
||||
|
@@ -287,7 +287,7 @@ static const struct net_device_ops zorro8390_netdev_ops = {
|
||||
};
|
||||
|
||||
static int zorro8390_init(struct net_device *dev, unsigned long board,
|
||||
const char *name, unsigned long ioaddr)
|
||||
const char *name, void __iomem *ioaddr)
|
||||
{
|
||||
int i;
|
||||
int err;
|
||||
@@ -354,7 +354,7 @@ static int zorro8390_init(struct net_device *dev, unsigned long board,
|
||||
start_page = NESM_START_PG;
|
||||
stop_page = NESM_STOP_PG;
|
||||
|
||||
dev->base_addr = ioaddr;
|
||||
dev->base_addr = (unsigned long)ioaddr;
|
||||
dev->irq = IRQ_AMIGA_PORTS;
|
||||
|
||||
/* Install the Interrupt handler */
|
||||
|
在新工单中引用
屏蔽一个用户