Commit 4eeabde5 authored by Linus Torvalds's avatar Linus Torvalds

sym53c8xx_2: remove unnecessary IO pointer casts

They just meant that the __iomem annotation couldn't shine
through.
parent 4ec5e62d
...@@ -288,32 +288,32 @@ typedef struct scsi_cmnd *cam_scsiio_p;/* SCSI I/O */ ...@@ -288,32 +288,32 @@ typedef struct scsi_cmnd *cam_scsiio_p;/* SCSI I/O */
* MEMORY mapped IO input / output * MEMORY mapped IO input / output
*/ */
#define INB_OFF(o) readb((char *)np->s.mmio_va + sym_offb(o)) #define INB_OFF(o) readb(np->s.mmio_va + sym_offb(o))
#define OUTB_OFF(o, val) writeb((val), (char *)np->s.mmio_va + sym_offb(o)) #define OUTB_OFF(o, val) writeb((val), np->s.mmio_va + sym_offb(o))
#if defined(__BIG_ENDIAN) && !defined(SYM_CONF_CHIP_BIG_ENDIAN) #if defined(__BIG_ENDIAN) && !defined(SYM_CONF_CHIP_BIG_ENDIAN)
#define INW_OFF(o) readw_l2b((char *)np->s.mmio_va + sym_offw(o)) #define INW_OFF(o) readw_l2b(np->s.mmio_va + sym_offw(o))
#define INL_OFF(o) readl_l2b((char *)np->s.mmio_va + (o)) #define INL_OFF(o) readl_l2b(np->s.mmio_va + (o))
#define OUTW_OFF(o, val) writew_b2l((val), (char *)np->s.mmio_va + sym_offw(o)) #define OUTW_OFF(o, val) writew_b2l((val), np->s.mmio_va + sym_offw(o))
#define OUTL_OFF(o, val) writel_b2l((val), (char *)np->s.mmio_va + (o)) #define OUTL_OFF(o, val) writel_b2l((val), np->s.mmio_va + (o))
#elif defined(__LITTLE_ENDIAN) && defined(SYM_CONF_CHIP_BIG_ENDIAN) #elif defined(__LITTLE_ENDIAN) && defined(SYM_CONF_CHIP_BIG_ENDIAN)
#define INW_OFF(o) readw_b2l((char *)np->s.mmio_va + sym_offw(o)) #define INW_OFF(o) readw_b2l(np->s.mmio_va + sym_offw(o))
#define INL_OFF(o) readl_b2l((char *)np->s.mmio_va + (o)) #define INL_OFF(o) readl_b2l(np->s.mmio_va + (o))
#define OUTW_OFF(o, val) writew_l2b((val), (char *)np->s.mmio_va + sym_offw(o)) #define OUTW_OFF(o, val) writew_l2b((val), np->s.mmio_va + sym_offw(o))
#define OUTL_OFF(o, val) writel_l2b((val), (char *)np->s.mmio_va + (o)) #define OUTL_OFF(o, val) writel_l2b((val), np->s.mmio_va + (o))
#else #else
#define INW_OFF(o) readw_raw((char *)np->s.mmio_va + sym_offw(o)) #define INW_OFF(o) readw_raw(np->s.mmio_va + sym_offw(o))
#define INL_OFF(o) readl_raw((char *)np->s.mmio_va + (o)) #define INL_OFF(o) readl_raw(np->s.mmio_va + (o))
#define OUTW_OFF(o, val) writew_raw((val), (char *)np->s.mmio_va + sym_offw(o)) #define OUTW_OFF(o, val) writew_raw((val), np->s.mmio_va + sym_offw(o))
#define OUTL_OFF(o, val) writel_raw((val), (char *)np->s.mmio_va + (o)) #define OUTL_OFF(o, val) writel_raw((val), np->s.mmio_va + (o))
#endif #endif
...@@ -390,8 +390,8 @@ struct sym_shcb { ...@@ -390,8 +390,8 @@ struct sym_shcb {
struct Scsi_Host *host; struct Scsi_Host *host;
void * mmio_va; /* MMIO kernel virtual address */ void __iomem * mmio_va; /* MMIO kernel virtual address */
void * ram_va; /* RAM kernel virtual address */ void __iomem * ram_va; /* RAM kernel virtual address */
u_long io_port; /* IO port address cookie */ u_long io_port; /* IO port address cookie */
u_short io_ws; /* IO window size */ u_short io_ws; /* IO window size */
int irq; /* IRQ number */ int irq; /* IRQ number */
...@@ -423,7 +423,7 @@ struct sym_slot { ...@@ -423,7 +423,7 @@ struct sym_slot {
int irq; int irq;
/* port and address fields to fit INB, OUTB macros */ /* port and address fields to fit INB, OUTB macros */
u_long io_port; u_long io_port;
void * mmio_va; void __iomem * mmio_va;
char inst_name[16]; char inst_name[16];
}; };
......
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