diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2015-05-22 10:31:46 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-05-30 16:20:32 +0200 |
| commit | 4a561c4b70b908c0b5cbcc8bc95bc796139e63ad (patch) | |
| tree | a6f11c0a90abf05c2d8ad86da343da4279b9c506 /drivers/media/pci/cobalt/cobalt-driver.h | |
| parent | [media] e4000: fix compiler warning (diff) | |
| download | linux-4a561c4b70b908c0b5cbcc8bc95bc796139e63ad.tar.xz linux-4a561c4b70b908c0b5cbcc8bc95bc796139e63ad.zip | |
[media] cobalt: fix sparse warnings
drivers/media/pci/cobalt/cobalt-flash.c:39:36: warning: incorrect type in initializer (different address spaces)
drivers/media/pci/cobalt/cobalt-flash.c:54:36: warning: incorrect type in initializer (different address spaces)
drivers/media/pci/cobalt/cobalt-flash.c:63:36: warning: incorrect type in initializer (different address spaces)
drivers/media/pci/cobalt/cobalt-flash.c:82:36: warning: incorrect type in initializer (different address spaces)
drivers/media/pci/cobalt/cobalt-flash.c:107:19: warning: incorrect type in assignment (different address spaces)
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/cobalt/cobalt-driver.h')
| -rw-r--r-- | drivers/media/pci/cobalt/cobalt-driver.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/pci/cobalt/cobalt-driver.h b/drivers/media/pci/cobalt/cobalt-driver.h index bb062ff950de..3d9a9ffb65ec 100644 --- a/drivers/media/pci/cobalt/cobalt-driver.h +++ b/drivers/media/pci/cobalt/cobalt-driver.h @@ -342,17 +342,17 @@ static inline u32 cobalt_g_sysstat(struct cobalt *cobalt) return cobalt_read_bar1(cobalt, COBALT_SYS_STAT_BASE); } -#define ADRS_REG (cobalt->bar1 + COBALT_BUS_BAR1_BASE + 0) -#define LOWER_DATA (cobalt->bar1 + COBALT_BUS_BAR1_BASE + 4) -#define UPPER_DATA (cobalt->bar1 + COBALT_BUS_BAR1_BASE + 6) +#define ADRS_REG (bar1 + COBALT_BUS_BAR1_BASE + 0) +#define LOWER_DATA (bar1 + COBALT_BUS_BAR1_BASE + 4) +#define UPPER_DATA (bar1 + COBALT_BUS_BAR1_BASE + 6) -static inline u32 cobalt_bus_read32(struct cobalt *cobalt, u32 bus_adrs) +static inline u32 cobalt_bus_read32(void __iomem *bar1, u32 bus_adrs) { iowrite32(bus_adrs, ADRS_REG); return ioread32(LOWER_DATA); } -static inline void cobalt_bus_write16(struct cobalt *cobalt, +static inline void cobalt_bus_write16(void __iomem *bar1, u32 bus_adrs, u16 data) { iowrite32(bus_adrs, ADRS_REG); @@ -362,7 +362,7 @@ static inline void cobalt_bus_write16(struct cobalt *cobalt, iowrite16(data, LOWER_DATA); } -static inline void cobalt_bus_write32(struct cobalt *cobalt, +static inline void cobalt_bus_write32(void __iomem *bar1, u32 bus_adrs, u16 data) { iowrite32(bus_adrs, ADRS_REG); |