Signed-off-by: Al Viro <v...@zeniv.linux.org.uk>
---
 drivers/net/ethernet/via/via-rhine.c    | 2 +-
 drivers/net/ethernet/via/via-velocity.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/via/via-rhine.c 
b/drivers/net/ethernet/via/via-rhine.c
index 33949248c829..f1fde0b7cda3 100644
--- a/drivers/net/ethernet/via/via-rhine.c
+++ b/drivers/net/ethernet/via/via-rhine.c
@@ -1150,7 +1150,7 @@ static int rhine_init_one_platform(struct platform_device 
*pdev)
                return -EINVAL;
 
        return rhine_init_one_common(&pdev->dev, *quirks,
-                                    (long)ioaddr, ioaddr, irq);
+                                    (unsigned long)ioaddr, ioaddr, irq);
 }
 
 static int alloc_ring(struct net_device* dev)
diff --git a/drivers/net/ethernet/via/via-velocity.c 
b/drivers/net/ethernet/via/via-velocity.c
index ef9538ee53d0..7b6dc6e8d6c0 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -92,14 +92,14 @@ enum velocity_bus_type {
 static int velocity_nics;
 static int msglevel = MSG_LEVEL_INFO;
 
-static void velocity_set_power_state(struct velocity_info *vptr, char state)
+static void velocity_set_power_state(struct velocity_info *vptr, pci_power_t 
state)
 {
-       void *addr = vptr->mac_regs;
+       void __iomem *addr = vptr->mac_regs;
 
        if (vptr->pdev)
                pci_set_power_state(vptr->pdev, state);
        else
-               writeb(state, addr + 0x154);
+               writeb((__force u8)state, addr + 0x154);
 }
 
 /**
-- 
2.11.0


Reply via email to