Message ID | 1385547448-13747-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com |
---|---|
State | Accepted |
Commit | 82ae816e160c6d349784daa03800006090d38fd0 |
Headers | show |
On Wed, Nov 27, 2013 at 11:17:28AM +0100, Laurent Pinchart wrote: > Cast pointers to uintptr_t instead of unsigned int. This fixes warnings > on platforms where pointers have a different size than int. > > Cc: David Woodhouse <dwmw2@infradead.org> > Cc: linux-mtd@lists.infradead.org > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > drivers/mtd/nand/sh_flctl.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > Changes compared to v1: > > - Cast to uintptr_t instead of unsigned long This patch has been in l2-mtd.git, but I forgot to alert you. Thanks for the patch! Brian
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c index a3c84eb..0f135cb 100644 --- a/drivers/mtd/nand/sh_flctl.c +++ b/drivers/mtd/nand/sh_flctl.c @@ -151,7 +151,7 @@ static void flctl_setup_dma(struct sh_flctl *flctl) dma_cap_set(DMA_SLAVE, mask); flctl->chan_fifo0_tx = dma_request_channel(mask, shdma_chan_filter, - (void *)pdata->slave_id_fifo0_tx); + (void *)(uintptr_t)pdata->slave_id_fifo0_tx); dev_dbg(&pdev->dev, "%s: TX: got channel %p\n", __func__, flctl->chan_fifo0_tx); @@ -168,7 +168,7 @@ static void flctl_setup_dma(struct sh_flctl *flctl) goto err; flctl->chan_fifo0_rx = dma_request_channel(mask, shdma_chan_filter, - (void *)pdata->slave_id_fifo0_rx); + (void *)(uintptr_t)pdata->slave_id_fifo0_rx); dev_dbg(&pdev->dev, "%s: RX: got channel %p\n", __func__, flctl->chan_fifo0_rx);
Cast pointers to uintptr_t instead of unsigned int. This fixes warnings on platforms where pointers have a different size than int. Cc: David Woodhouse <dwmw2@infradead.org> Cc: linux-mtd@lists.infradead.org Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/mtd/nand/sh_flctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Changes compared to v1: - Cast to uintptr_t instead of unsigned long