Commit d63ffc22 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] M68k net warnings

M68k net drivers: Kill warnings caused by implicit conversions from volatile *
parent 430805cb
...@@ -646,7 +646,7 @@ static int init_i596_mem(struct net_device *dev) ...@@ -646,7 +646,7 @@ static int init_i596_mem(struct net_device *dev)
/* change the scp address */ /* change the scp address */
MPU_PORT(dev, PORT_ALTSCP, (void *)virt_to_bus(&lp->scp)); MPU_PORT(dev, PORT_ALTSCP, (void *)virt_to_bus((void *)&lp->scp));
#elif defined(ENABLE_APRICOT) #elif defined(ENABLE_APRICOT)
...@@ -677,8 +677,8 @@ static int init_i596_mem(struct net_device *dev) ...@@ -677,8 +677,8 @@ static int init_i596_mem(struct net_device *dev)
lp->scp.sysbus = 0x00440000; lp->scp.sysbus = 0x00440000;
#endif #endif
lp->scp.iscp = WSWAPiscp(virt_to_bus(&(lp->iscp))); lp->scp.iscp = WSWAPiscp(virt_to_bus((void *)&lp->iscp));
lp->iscp.scb = WSWAPscb(virt_to_bus(&(lp->scb))); lp->iscp.scb = WSWAPscb(virt_to_bus((void *)&lp->scb));
lp->iscp.stat = ISCP_BUSY; lp->iscp.stat = ISCP_BUSY;
lp->cmd_backlog = 0; lp->cmd_backlog = 0;
......
...@@ -331,8 +331,8 @@ static int mace_open(struct net_device *dev) ...@@ -331,8 +331,8 @@ static int mace_open(struct net_device *dev)
return -ENOMEM; return -ENOMEM;
} }
mp->rx_ring_phys = (unsigned char *) virt_to_bus(mp->rx_ring); mp->rx_ring_phys = (unsigned char *) virt_to_bus((void *)mp->rx_ring);
mp->tx_ring_phys = (unsigned char *) virt_to_bus(mp->tx_ring); mp->tx_ring_phys = (unsigned char *) virt_to_bus((void *)mp->tx_ring);
/* We want the Rx buffer to be uncached and the Tx buffer to be writethrough */ /* We want the Rx buffer to be uncached and the Tx buffer to be writethrough */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment