drivers/ misc __iomem annotations

PATCH New Al Viro 1 participant 1 message Jul 26, 2007

Subsystems (4)

Framebuffer layer EDAC-core W1 dallas's 1-wire bus EDAC-I3000

lore

Share & tools

lore

Al Viro

author

2007-07-26 16:42 UTC #0 lore raw

PATCH 1/1 drivers/ misc __iomem annotations

Signed-off-by Al Viro <[email protected]>

---
 drivers/edac/i3000_edac.c  |    2 +-
 drivers/ide/pci/scc_pata.c |    4 ++--
 drivers/video/tgafb.c      |    2 +-
 drivers/w1/masters/ds1wm.c |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

drivers/edac/i3000_edac.c +1 -1

index 0ecfdc4..e895f9f 100644
@@ -275,7 +275,7 @@ static int i3000_probe1(struct pci_dev *pdev, int dev_idx)
 	unsigned char *c0dra = dra, *c1dra = &dra[I3000_RANKS_PER_CHANNEL / 2];
 	unsigned char *c0drb = drb, *c1drb = &drb[I3000_RANKS_PER_CHANNEL];
 	unsigned long mchbar;
-	void *window;
+	void __iomem *window;
 
 	debugf0("MC: %s()\n", __func__);

drivers/ide/pci/scc_pata.c +2 -2

index f668d23..bf19ddf 100644
@@ -551,8 +551,8 @@ static int setup_mmio_scc (struct pci_dev *dev, const char *name)
 	unsigned long dma_base = pci_resource_start(dev, 1);
 	unsigned long ctl_size = pci_resource_len(dev, 0);
 	unsigned long dma_size = pci_resource_len(dev, 1);
-	void *ctl_addr;
-	void *dma_addr;
+	void __iomem *ctl_addr;
+	void __iomem *dma_addr;
 	int i;
 
 	for (i = 0; i < MAX_HWIFS; i++) {

drivers/video/tgafb.c +1 -1

index 89facb7..d292a37 100644
@@ -849,7 +849,7 @@ tgafb_clut_imageblit(struct fb_info *info, const struct fb_image *image)
 	u32 *palette = ((u32 *)info->pseudo_palette);
 	unsigned long pos, line_length, i, j;
 	const unsigned char *data;
-	void *regs_base, *fb_base;
+	void __iomem *regs_base, *fb_base;
 
 	dx = image->dx;
 	dy = image->dy;

drivers/w1/masters/ds1wm.c +1 -1

index 763bc73..4b69664 100644
@@ -85,7 +85,7 @@ static struct {
 };
 
 struct ds1wm_data {
-	void		*map;
+	void		__iomem *map;
 	int		bus_shift; /* # of shifts to calc register offsets */
 	struct platform_device *pdev;
 	struct ds1wm_platform_data *pdata;

Signature · 1 line

1.5.3.GIT