* [PATCH -next] dmaengine: iop-adma: Fix -Wint-to-pointer-cast build warning
@ 2020-08-03 14:10 YueHaibing
2020-08-05 13:12 ` Vinod Koul
0 siblings, 1 reply; 2+ messages in thread
From: YueHaibing @ 2020-08-03 14:10 UTC (permalink / raw)
To: dan.j.williams, vkoul; +Cc: dmaengine, linux-kernel, YueHaibing
drivers/dma/iop-adma.c:447:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
drivers/dma/iop-adma.c:449:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
drivers/dma/iop-adma.c:1301:3: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
Use void* for dma_desc_pool_virt, dma_addr_t for dma_desc_pool,
and use %pad to print dma_addr_t.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
drivers/dma/iop-adma.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 3350bffb2e93..8e17e4405959 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -415,7 +415,8 @@ 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;
+ void *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;
@@ -436,17 +437,16 @@ static int iop_adma_alloc_chan_resources(struct dma_chan *chan)
" %d descriptor slots", idx);
break;
}
- hw_desc = (char *) iop_chan->device->dma_desc_pool_virt;
- slot->hw_desc = (void *) &hw_desc[idx * IOP_ADMA_SLOT_SIZE];
+ hw_desc = iop_chan->device->dma_desc_pool_virt;
+ slot->hw_desc = hw_desc + idx * IOP_ADMA_SLOT_SIZE;
dma_async_tx_descriptor_init(&slot->async_tx, chan);
slot->async_tx.tx_submit = iop_adma_tx_submit;
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;
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] dmaengine: iop-adma: Fix -Wint-to-pointer-cast build warning
2020-08-03 14:10 [PATCH -next] dmaengine: iop-adma: Fix -Wint-to-pointer-cast build warning YueHaibing
@ 2020-08-05 13:12 ` Vinod Koul
0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2020-08-05 13:12 UTC (permalink / raw)
To: YueHaibing; +Cc: dan.j.williams, dmaengine, linux-kernel
On 03-08-20, 22:10, YueHaibing wrote:
> drivers/dma/iop-adma.c:447:13: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
> drivers/dma/iop-adma.c:449:4: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
> drivers/dma/iop-adma.c:1301:3: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
>
> Use void* for dma_desc_pool_virt, dma_addr_t for dma_desc_pool,
> and use %pad to print dma_addr_t.
>
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
> drivers/dma/iop-adma.c | 17 ++++++++---------
> 1 file changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
> index 3350bffb2e93..8e17e4405959 100644
> --- a/drivers/dma/iop-adma.c
> +++ b/drivers/dma/iop-adma.c
> @@ -415,7 +415,8 @@ 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;
> + void *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;
> @@ -436,17 +437,16 @@ static int iop_adma_alloc_chan_resources(struct dma_chan *chan)
> " %d descriptor slots", idx);
> break;
> }
> - hw_desc = (char *) iop_chan->device->dma_desc_pool_virt;
> - slot->hw_desc = (void *) &hw_desc[idx * IOP_ADMA_SLOT_SIZE];
> + hw_desc = iop_chan->device->dma_desc_pool_virt;
> + slot->hw_desc = hw_desc + idx * IOP_ADMA_SLOT_SIZE;
So you want to pointer arithmetic on a void pointer !
Are you sure math is correct here and will work on different compilers?
>
> dma_async_tx_descriptor_init(&slot->async_tx, chan);
> slot->async_tx.tx_submit = iop_adma_tx_submit;
> 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;
>
> --
> 2.17.1
>
--
~Vinod
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-08-05 20:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-03 14:10 [PATCH -next] dmaengine: iop-adma: Fix -Wint-to-pointer-cast build warning YueHaibing
2020-08-05 13:12 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).