lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] more s2io __iomem annotations

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Al Viro
2006-09-23 01:33:40 +01:00
committed by Jeff Garzik
parent 0c5649af3a
commit cc3afe6f85
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/s2io.c
View File

@@ -2904,7 +2904,7 @@ static void s2io_mdio_write(u32 mmd_type, u64 addr, u16 value, struct net_device
{ {
u64 val64 = 0x0; u64 val64 = 0x0;
nic_t *sp = dev->priv; nic_t *sp = dev->priv;
XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp->bar0; XENA_dev_config_t __iomem *bar0 = sp->bar0;
//address transaction //address transaction
val64 = val64 | MDIO_MMD_INDX_ADDR(addr) 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)
u64 val64 = 0x0; u64 val64 = 0x0;
u64 rval64 = 0x0; u64 rval64 = 0x0;
nic_t *sp = dev->priv; nic_t *sp = dev->priv;
XENA_dev_config_t *bar0 = (XENA_dev_config_t *)sp->bar0; XENA_dev_config_t __iomem *bar0 = sp->bar0;
/* address transaction */ /* address transaction */
val64 = val64 | MDIO_MMD_INDX_ADDR(addr) val64 = val64 | MDIO_MMD_INDX_ADDR(addr)
@@ -3276,7 +3276,7 @@ static void alarm_intr_handler(struct s2io_nic *nic)
* SUCCESS on success and FAILURE on failure. * SUCCESS on success and FAILURE on failure.
*/ */
static int wait_for_cmd_complete(void *addr, u64 busy_bit) static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit)
{ {
int ret = FAILURE, cnt = 0; int ret = FAILURE, cnt = 0;
u64 val64; u64 val64;