From 56e0c3a9d46241671eb681fc97c0c0794177d666 Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Wed, 20 Oct 2004 03:17:45 -0700 Subject: [PATCH] [PATCH] ips iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds --- drivers/scsi/ips.c | 4 ++-- drivers/scsi/ips.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 692a6ceeb4d7b..64ae538abc357 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c @@ -7175,8 +7175,8 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr) int j; int index; dma_addr_t dma_address; - char *ioremap_ptr; - char *mem_ptr; + char __iomem *ioremap_ptr; + char __iomem *mem_ptr; uint32_t IsDead; METHOD_TRACE("ips_init_phase1", 1); diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h index de7b0205a9ba9..d1553a0a30967 100644 --- a/drivers/scsi/ips.h +++ b/drivers/scsi/ips.h @@ -1117,8 +1117,8 @@ typedef struct ips_ha { uint32_t mem_addr; /* Memory mapped address */ uint32_t io_len; /* Size of IO Address */ uint32_t mem_len; /* Size of memory address */ - char *mem_ptr; /* Memory mapped Ptr */ - char *ioremap_ptr; /* ioremapped memory pointer */ + char __iomem *mem_ptr; /* Memory mapped Ptr */ + char __iomem *ioremap_ptr;/* ioremapped memory pointer */ ips_hw_func_t func; /* hw function pointers */ struct pci_dev *pcidev; /* PCI device handle */ char *flash_data; /* Save Area for flash data */ -- 2.53.0