[media] netup_unidvb: remove most of the sparse warnings

author Mauro Carvalho Chehab <mchehab@osg.samsung.com>

Thu, 1 Oct 2015 21:49:29 +0000 (18:49 -0300)

committer Mauro Carvalho Chehab <mchehab@osg.samsung.com>

Thu, 1 Oct 2015 21:57:35 +0000 (18:57 -0300)
author Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 1 Oct 2015 21:49:29 +0000 (18:49 -0300)
committer Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 1 Oct 2015 21:57:35 +0000 (18:57 -0300)
diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb.h b/drivers/media/pci/netup_unidvb/netup_unidvb.h

index fa951102d7fbc54aa7bf1337de71c1ef88e122ab..a67b281119056865b6415eececd3618115e970d1 100644 (file)
--- a/drivers/media/pci/netup_unidvb/netup_unidvb.h
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb.h
@@ -54,7 +54,7 @@ struct netup_dma {
         u8                      num;
         spinlock_t              lock;
         struct netup_unidvb_dev *ndev;
-       struct netup_dma_regs   *regs;
+       struct netup_dma_regs __iomem *regs;
         u32                     ring_buffer_size;
         u8                      *addr_virt;
         dma_addr_t              addr_phys;
@@ -82,7 +82,7 @@ struct netup_i2c {
         wait_queue_head_t               wq;
         struct i2c_adapter              adap;
         struct netup_unidvb_dev         *dev;
-       struct netup_i2c_regs           *regs;
+       struct netup_i2c_regs __iomem   *regs;
         struct i2c_msg                  *msg;
         enum netup_i2c_state            state;
         u32                             xmit_size;
diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_ci.c b/drivers/media/pci/netup_unidvb/netup_unidvb_ci.c

index 751b51b03593fe6cabd496bb42f117e868d0937d..0bfb14c9e527acb5fc13eb34940fa149cdf3324f 100644 (file)
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_ci.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_ci.c
@@ -226,7 +226,7 @@ int netup_unidvb_ci_register(struct netup_unidvb_dev *dev,
                         __func__, result);
                 return result;
         }
-       writew(NETUP_UNIDVB_IRQ_CI, (u16 *)(dev->bmmio0 + REG_IMASK_SET));
+       writew(NETUP_UNIDVB_IRQ_CI, dev->bmmio0 + REG_IMASK_SET);
         dev_info(&pci_dev->dev,
                 "%s(): CI adapter %d init done\n", __func__, num);
         return 0;
diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c

index b012aa658a54405e4386f74a043dcd496cbd2652..04c8411ea27d58a3f28899778fd10c71bed11250 100644 (file)
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
@@ -190,12 +190,10 @@ static void netup_unidvb_dma_enable(struct netup_dma *dma, int enable)
                 "%s(): DMA%d enable %d\n", __func__, dma->num, enable);
         if (enable) {
                 writel(BIT_DMA_RUN, &dma->regs->ctrlstat_set);
-               writew(irq_mask,
-                       (u16 *)(dma->ndev->bmmio0 + REG_IMASK_SET));
+               writew(irq_mask, dma->ndev->bmmio0 + REG_IMASK_SET);
         } else {
                 writel(BIT_DMA_RUN, &dma->regs->ctrlstat_clear);
-               writew(irq_mask,
-                       (u16 *)(dma->ndev->bmmio0 + REG_IMASK_CLEAR));
+               writew(irq_mask, dma->ndev->bmmio0 + REG_IMASK_CLEAR);
         }
  }
  
@@ -525,7 +523,7 @@ static int netup_unidvb_ring_copy(struct netup_dma *dma,
                 ring_bytes = dma->ring_buffer_size - dma->data_offset;
                 copy_bytes = (ring_bytes > buff_bytes) ?
                         buff_bytes : ring_bytes;
-               memcpy_fromio(p, dma->addr_virt + dma->data_offset, copy_bytes);
+               memcpy_fromio(p, (u8 __iomem *)(dma->addr_virt + dma->data_offset), copy_bytes);
                 p += copy_bytes;
                 buf->size += copy_bytes;
                 buff_bytes -= copy_bytes;
@@ -538,7 +536,7 @@ static int netup_unidvb_ring_copy(struct netup_dma *dma,
                 ring_bytes = dma->data_size;
                 copy_bytes = (ring_bytes > buff_bytes) ?
                                 buff_bytes : ring_bytes;
-               memcpy_fromio(p, dma->addr_virt + dma->data_offset, copy_bytes);
+               memcpy_fromio(p, (u8 __iomem *)(dma->addr_virt + dma->data_offset), copy_bytes);
                 buf->size += copy_bytes;
                 dma->data_size -= copy_bytes;
                 dma->data_offset += copy_bytes;
@@ -644,10 +642,10 @@ static int netup_unidvb_dma_init(struct netup_unidvb_dev *ndev, int num)
                 __func__, num, dma->addr_virt,
                 (unsigned long long)dma->addr_phys,
                 dma->ring_buffer_size);
-       memset_io(dma->addr_virt, 0, dma->ring_buffer_size);
+       memset_io((u8 __iomem *)dma->addr_virt, 0, dma->ring_buffer_size);
         dma->addr_last = dma->addr_phys;
         dma->high_addr = (u32)(dma->addr_phys & 0xC0000000);
-       dma->regs = (struct netup_dma_regs *)(num == 0 ?
+       dma->regs = (struct netup_dma_regs __iomem *)(num == 0 ?
                 ndev->bmmio0 + NETUP_DMA0_ADDR :
                 ndev->bmmio0 + NETUP_DMA1_ADDR);
         writel((NETUP_DMA_BLOCKS_COUNT << 24) |
diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c b/drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c

index eaaa2d0a5fba227c25ad90c75b729ea92b3b019d..c09c52bc6eabefe464546fc0d09f52146f537c7c 100644 (file)
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c
@@ -320,7 +320,7 @@ static int netup_i2c_init(struct netup_unidvb_dev *ndev, int bus_num)
         i2c = &ndev->i2c[bus_num];
         spin_lock_init(&i2c->lock);
         init_waitqueue_head(&i2c->wq);
-       i2c->regs = (struct netup_i2c_regs *)(ndev->bmmio0 +
+       i2c->regs = (struct netup_i2c_regs __iomem *)(ndev->bmmio0 +
                 (bus_num == 0 ? NETUP_I2C_BUS0_ADDR : NETUP_I2C_BUS1_ADDR));
         netup_i2c_reset(i2c);
         i2c->adap = netup_i2c_adapter;
diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c b/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c

index f55b3276f28de0122c3f4e4385cb3a1736d0b430..d659f59745048a03483e3496147392b34fc68681 100644 (file)
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
@@ -45,7 +45,7 @@ struct netup_spi_regs {
  struct netup_spi {
         struct device                   *dev;
         struct spi_master               *master;
-       struct netup_spi_regs           *regs;
+       struct netup_spi_regs __iomem   *regs;
         u8 __iomem                      *mmio;
         spinlock_t                      lock;
         wait_queue_head_t               waitq;
@@ -202,7 +202,7 @@ int netup_spi_init(struct netup_unidvb_dev *ndev)
         spin_lock_init(&nspi->lock);
         init_waitqueue_head(&nspi->waitq);
         nspi->master = master;
-       nspi->regs = (struct netup_spi_regs *)(ndev->bmmio0 + 0x4000);
+       nspi->regs = (struct netup_spi_regs __iomem *)(ndev->bmmio0 + 0x4000);
         writew(2, &nspi->regs->clock_divider);
         writew(NETUP_UNIDVB_IRQ_SPI, ndev->bmmio0 + REG_IMASK_SET);
         ndev->spi = nspi;
author	Mauro Carvalho Chehab <mchehab@osg.samsung.com>
	Thu, 1 Oct 2015 21:49:29 +0000 (18:49 -0300)
committer	Mauro Carvalho Chehab <mchehab@osg.samsung.com>
	Thu, 1 Oct 2015 21:57:35 +0000 (18:57 -0300)
drivers/media/pci/netup_unidvb/netup_unidvb.h		patch \| blob \| history
drivers/media/pci/netup_unidvb/netup_unidvb_ci.c		patch \| blob \| history
drivers/media/pci/netup_unidvb/netup_unidvb_core.c		patch \| blob \| history
drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c		patch \| blob \| history
drivers/media/pci/netup_unidvb/netup_unidvb_spi.c		patch \| blob \| history