dmaengine: iop-adma: Fix pointer cast warnings
authorYueHaibing <yuehaibing@huawei.com>
Tue, 18 Aug 2020 11:51:01 +0000 (19:51 +0800)
committerVinod Koul <vkoul@kernel.org>
Fri, 18 Sep 2020 07:25:16 +0000 (12:55 +0530)
drivers/dma/iop-adma.c: In function ‘iop_adma_alloc_chan_resources’:
drivers/dma/iop-adma.c:447:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
   hw_desc = (char *) iop_chan->device->dma_desc_pool;
             ^
drivers/dma/iop-adma.c:449:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
    (dma_addr_t) &hw_desc[idx * IOP_ADMA_SLOT_SIZE];
    ^
drivers/dma/iop-adma.c: In function ‘iop_adma_probe’:
drivers/dma/iop-adma.c:1301:3: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
   (void *) adev->dma_desc_pool);

Use dma_addr_t for dma_desc_pool, and %pad to print dma_addr_t.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Link: https://lore.kernel.org/r/20200818115101.55700-1-yuehaibing@huawei.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/iop-adma.c

index 3350bff..48d56c9 100644 (file)
@@ -416,6 +416,7 @@ static void iop_chan_start_null_xor(struct iop_adma_chan *iop_chan);
 static int iop_adma_alloc_chan_resources(struct dma_chan *chan)
 {
        char *hw_desc;
+       dma_addr_t dma_desc;
        int idx;
        struct iop_adma_chan *iop_chan = to_iop_adma_chan(chan);
        struct iop_adma_desc_slot *slot = NULL;
@@ -444,9 +445,8 @@ static int iop_adma_alloc_chan_resources(struct dma_chan *chan)
                INIT_LIST_HEAD(&slot->tx_list);
                INIT_LIST_HEAD(&slot->chain_node);
                INIT_LIST_HEAD(&slot->slot_node);
-               hw_desc = (char *) iop_chan->device->dma_desc_pool;
-               slot->async_tx.phys =
-                       (dma_addr_t) &hw_desc[idx * IOP_ADMA_SLOT_SIZE];
+               dma_desc = iop_chan->device->dma_desc_pool;
+               slot->async_tx.phys = dma_desc + idx * IOP_ADMA_SLOT_SIZE;
                slot->idx = idx;
 
                spin_lock_bh(&iop_chan->lock);
@@ -1296,9 +1296,8 @@ static int iop_adma_probe(struct platform_device *pdev)
                goto err_free_adev;
        }
 
-       dev_dbg(&pdev->dev, "%s: allocated descriptor pool virt %p phys %p\n",
-               __func__, adev->dma_desc_pool_virt,
-               (void *) adev->dma_desc_pool);
+       dev_dbg(&pdev->dev, "%s: allocated descriptor pool virt %p phys %pad\n",
+               __func__, adev->dma_desc_pool_virt, &adev->dma_desc_pool);
 
        adev->id = plat_data->hw_id;