Skip to content

Commit

Permalink
[PATCH] more s2io __iomem annotations
Browse files Browse the repository at this point in the history 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Al Viro authored and Jeff Garzik committed Sep 26, 2006
1 parent 0c5649a commit cc3afe6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/s2io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2904,7 +2904,7 @@ static void s2io_mdio_write(u32 mmd_type, u64 addr, u16 value, struct net_device
{
u64 val64 = 0x0;
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
val64 = val64 | MDIO_MMD_INDX_ADDR(addr)
Expand Down Expand Up @@ -2953,7 +2953,7 @@ static u64 s2io_mdio_read(u32 mmd_type, u64 addr, struct net_device *dev)
u64 val64 = 0x0;
u64 rval64 = 0x0;
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 */
val64 = val64 | MDIO_MMD_INDX_ADDR(addr)
Expand Down Expand Up @@ -3276,7 +3276,7 @@ static void alarm_intr_handler(struct s2io_nic *nic)
* 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;
u64 val64;
Expand Down

0 comments on commit cc3afe6

Please sign in to comment.