tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

s2io iomem annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Al Viro and committed by
Linus Torvalds 1a79d1c3 1d92cfd5

+6 -4
+6 -4
drivers/net/s2io.c
··· 2861 2861 struct config_param *config; 2862 2862 struct mac_info *mac_control; 2863 2863 int pkts_processed = 0; 2864 - u8 *addr = NULL, val8 = 0; 2864 + u8 __iomem *addr = NULL; 2865 + u8 val8 = 0; 2865 2866 struct s2io_nic *nic = dev->priv; 2866 2867 struct XENA_dev_config __iomem *bar0 = nic->bar0; 2867 2868 int budget_org = budget; ··· 2879 2878 if (pkts_processed < budget_org) { 2880 2879 netif_rx_complete(dev, napi); 2881 2880 /*Re Enable MSI-Rx Vector*/ 2882 - addr = (u8 *)&bar0->xmsi_mask_reg; 2881 + addr = (u8 __iomem *)&bar0->xmsi_mask_reg; 2883 2882 addr += 7 - ring->ring_no; 2884 2883 val8 = (ring->ring_no == 0) ? 0x3f : 0xbf; 2885 2884 writeb(val8, addr); ··· 4365 4364 return IRQ_HANDLED; 4366 4365 4367 4366 if (sp->config.napi) { 4368 - u8 *addr = NULL, val8 = 0; 4367 + u8 __iomem *addr = NULL; 4368 + u8 val8 = 0; 4369 4369 4370 - addr = (u8 *)&bar0->xmsi_mask_reg; 4370 + addr = (u8 __iomem *)&bar0->xmsi_mask_reg; 4371 4371 addr += (7 - ring->ring_no); 4372 4372 val8 = (ring->ring_no == 0) ? 0x7f : 0xff; 4373 4373 writeb(val8, addr);