aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2008-06-02 05:59:02 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-06-10 18:20:41 -0400
commit69de8d23d10694bdd63fe715b98e1a61c56ed288 (patch)
tree5b6118894c56c5888385c16c7565d43f644b1d3b /drivers/net
parentae6b4d9ab6129467415801f30e487bc141a3f471 (diff)
s2io iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/s2io.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index a20693e09ae8..b5c1e663417d 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -2861,7 +2861,8 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
2861 struct config_param *config; 2861 struct config_param *config;
2862 struct mac_info *mac_control; 2862 struct mac_info *mac_control;
2863 int pkts_processed = 0; 2863 int pkts_processed = 0;
2864 u8 *addr = NULL, val8 = 0; 2864 u8 __iomem *addr = NULL;
2865 u8 val8 = 0;
2865 struct s2io_nic *nic = dev->priv; 2866 struct s2io_nic *nic = dev->priv;
2866 struct XENA_dev_config __iomem *bar0 = nic->bar0; 2867 struct XENA_dev_config __iomem *bar0 = nic->bar0;
2867 int budget_org = budget; 2868 int budget_org = budget;
@@ -2878,7 +2879,7 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
2878 if (pkts_processed < budget_org) { 2879 if (pkts_processed < budget_org) {
2879 netif_rx_complete(dev, napi); 2880 netif_rx_complete(dev, napi);
2880 /*Re Enable MSI-Rx Vector*/ 2881 /*Re Enable MSI-Rx Vector*/
2881 addr = (u8 *)&bar0->xmsi_mask_reg; 2882 addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
2882 addr += 7 - ring->ring_no; 2883 addr += 7 - ring->ring_no;
2883 val8 = (ring->ring_no == 0) ? 0x3f : 0xbf; 2884 val8 = (ring->ring_no == 0) ? 0x3f : 0xbf;
2884 writeb(val8, addr); 2885 writeb(val8, addr);
@@ -4364,9 +4365,10 @@ static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id)
4364 return IRQ_HANDLED; 4365 return IRQ_HANDLED;
4365 4366
4366 if (sp->config.napi) { 4367 if (sp->config.napi) {
4367 u8 *addr = NULL, val8 = 0; 4368 u8 __iomem *addr = NULL;
4369 u8 val8 = 0;
4368 4370
4369 addr = (u8 *)&bar0->xmsi_mask_reg; 4371 addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
4370 addr += (7 - ring->ring_no); 4372 addr += (7 - ring->ring_no);
4371 val8 = (ring->ring_no == 0) ? 0x7f : 0xff; 4373 val8 = (ring->ring_no == 0) ? 0x7f : 0xff;
4372 writeb(val8, addr); 4374 writeb(val8, addr);