diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2012-10-15 12:20:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-22 11:57:15 -0700 |
| commit | 95b24682d6a7e584f69615e36ee304caba20e38f (patch) | |
| tree | 4836b061b7f7a098b6331d1b1cb41dee1a9da831 /drivers/staging/comedi/drivers/jr3_pci.h | |
| parent | 7195ea042cc2021a76bb83057850b703dc921ebb (diff) | |
staging: comedi: jr3_pci: add __iomem tags
Tag pointers to remapped I/O memory with `__iomem` and remove the
`volatile` qualifiers.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/jr3_pci.h')
| -rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/jr3_pci.h b/drivers/staging/comedi/drivers/jr3_pci.h index 9c42653d8f18..3317f7a04c48 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.h +++ b/drivers/staging/comedi/drivers/jr3_pci.h @@ -2,22 +2,22 @@ * is 16 bits, but aligned on a 32 bit PCI boundary */ -static inline u16 get_u16(volatile const u32 * p) +static inline u16 get_u16(const u32 __iomem *p) { - return (u16) readl(p); + return (u16)readl(p); } -static inline void set_u16(volatile u32 * p, u16 val) +static inline void set_u16(u32 __iomem *p, u16 val) { writel(val, p); } -static inline s16 get_s16(volatile const s32 * p) +static inline s16 get_s16(const s32 __iomem *p) { - return (s16) readl(p); + return (s16)readl(p); } -static inline void set_s16(volatile s32 * p, s16 val) +static inline void set_s16(s32 __iomem *p, s16 val) { writel(val, p); } |