Commit 69de8d23 authored by Al Viro's avatar Al Viro Committed by Jeff Garzik

s2io iomem annotations

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent ae6b4d9a
...@@ -2861,7 +2861,8 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget) ...@@ -2861,7 +2861,8 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
struct config_param *config; struct config_param *config;
struct mac_info *mac_control; struct mac_info *mac_control;
int pkts_processed = 0; int pkts_processed = 0;
u8 *addr = NULL, val8 = 0; u8 __iomem *addr = NULL;
u8 val8 = 0;
struct s2io_nic *nic = dev->priv; struct s2io_nic *nic = dev->priv;
struct XENA_dev_config __iomem *bar0 = nic->bar0; struct XENA_dev_config __iomem *bar0 = nic->bar0;
int budget_org = budget; int budget_org = budget;
...@@ -2878,7 +2879,7 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget) ...@@ -2878,7 +2879,7 @@ static int s2io_poll_msix(struct napi_struct *napi, int budget)
if (pkts_processed < budget_org) { if (pkts_processed < budget_org) {
netif_rx_complete(dev, napi); netif_rx_complete(dev, napi);
/*Re Enable MSI-Rx Vector*/ /*Re Enable MSI-Rx Vector*/
addr = (u8 *)&bar0->xmsi_mask_reg; addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
addr += 7 - ring->ring_no; addr += 7 - ring->ring_no;
val8 = (ring->ring_no == 0) ? 0x3f : 0xbf; val8 = (ring->ring_no == 0) ? 0x3f : 0xbf;
writeb(val8, addr); writeb(val8, addr);
...@@ -4364,9 +4365,10 @@ static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id) ...@@ -4364,9 +4365,10 @@ static irqreturn_t s2io_msix_ring_handle(int irq, void *dev_id)
return IRQ_HANDLED; return IRQ_HANDLED;
if (sp->config.napi) { if (sp->config.napi) {
u8 *addr = NULL, val8 = 0; u8 __iomem *addr = NULL;
u8 val8 = 0;
addr = (u8 *)&bar0->xmsi_mask_reg; addr = (u8 __iomem *)&bar0->xmsi_mask_reg;
addr += (7 - ring->ring_no); addr += (7 - ring->ring_no);
val8 = (ring->ring_no == 0) ? 0x7f : 0xff; val8 = (ring->ring_no == 0) ? 0x7f : 0xff;
writeb(val8, addr); writeb(val8, addr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment