diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-09-22 20:33:40 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-25 20:08:10 -0400 |
commit | cc3afe6f856054a3752ef2b3ccc5eebf33bd5024 (patch) | |
tree | 95b5b48a0b9082ae8f1f808305d070c7f759ce85 /drivers/net | |
parent | 0c5649af3accc7f2941c5eebcc613e1a81b03448 (diff) |
[PATCH] more s2io __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/s2io.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index c50f4bf34202..1bf23e41f580 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -2904,7 +2904,7 @@ static void s2io_mdio_write(u32 mmd_type, u64 addr, u16 value, struct net_device | |||
2904 | { | 2904 | { |
2905 | u64 val64 = 0x0; | 2905 | u64 val64 = 0x0; |
2906 | nic_t *sp = dev->priv; | 2906 | nic_t *sp = dev->priv; |
2907 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp->bar0; | 2907 | XENA_dev_config_t __iomem *bar0 = sp->bar0; |
2908 | 2908 | ||
2909 | //address transaction | 2909 | //address transaction |
2910 | val64 = val64 | MDIO_MMD_INDX_ADDR(addr) | 2910 | val64 = val64 | MDIO_MMD_INDX_ADDR(addr) |
@@ -2953,7 +2953,7 @@ static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev) | |||
2953 | u64 val64 = 0x0; | 2953 | u64 val64 = 0x0; |
2954 | u64 rval64 = 0x0; | 2954 | u64 rval64 = 0x0; |
2955 | nic_t *sp = dev->priv; | 2955 | nic_t *sp = dev->priv; |
2956 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp->bar0; | 2956 | XENA_dev_config_t __iomem *bar0 = sp->bar0; |
2957 | 2957 | ||
2958 | /* address transaction */ | 2958 | /* address transaction */ |
2959 | val64 = val64 | MDIO_MMD_INDX_ADDR(addr) | 2959 | val64 = val64 | MDIO_MMD_INDX_ADDR(addr) |
@@ -3276,7 +3276,7 @@ static void alarm_intr_handler(struct s2io_nic *nic) | |||
3276 | * SUCCESS on success and FAILURE on failure. | 3276 | * SUCCESS on success and FAILURE on failure. |
3277 | */ | 3277 | */ |
3278 | 3278 | ||
3279 | static int wait_for_cmd_complete(void *addr, u64 busy_bit) | 3279 | static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit) |
3280 | { | 3280 | { |
3281 | int ret = FAILURE, cnt = 0; | 3281 | int ret = FAILURE, cnt = 0; |
3282 | u64 val64; | 3282 | u64 val64; |