Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37eb47ed authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] s2io: __iomem annotations for recent changes 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 51bfb75b

drivers/net/s2io.c

+5 −5
Original line number Diff line number Diff line
@@ -3078,7 +3078,7 @@ int s2io_set_swapper(nic_t * sp) 


static int wait_for_msix_trans(nic_t *nic, int i)

{

	XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;

	XENA_dev_config_t __iomem *bar0 = nic->bar0;

	u64 val64;

	int ret = 0, cnt = 0;
@@ -3099,7 +3099,7 @@ static int wait_for_msix_trans(nic_t *nic, int i) 


void restore_xmsi_data(nic_t *nic)

{

	XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;

	XENA_dev_config_t __iomem *bar0 = nic->bar0;

	u64 val64;

	int i;
@@ -3117,7 +3117,7 @@ void restore_xmsi_data(nic_t *nic) 


static void store_xmsi_data(nic_t *nic)

{

	XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;

	XENA_dev_config_t __iomem *bar0 = nic->bar0;

	u64 val64, addr, data;

	int i;
@@ -3140,7 +3140,7 @@ static void store_xmsi_data(nic_t *nic) 


int s2io_enable_msi(nic_t *nic)

{

	XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;

	XENA_dev_config_t __iomem *bar0 = nic->bar0;

	u16 msi_ctrl, msg_val;

	struct config_param *config = &nic->config;

	struct net_device *dev = nic->dev;
@@ -3190,7 +3190,7 @@ int s2io_enable_msi(nic_t *nic) 


int s2io_enable_msi_x(nic_t *nic)

{

	XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0;

	XENA_dev_config_t __iomem *bar0 = nic->bar0;

	u64 tx_mat, rx_mat;

	u16 msi_control; /* Temp variable */

	int ret, i, j, msix_indx = 1;