| From 609d5a1b2b35bb62b4b3750396e55453160c2a17 Mon Sep 17 00:00:00 2001 |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| Date: Wed, 13 Apr 2016 13:59:14 +1000 |
| Subject: i2c: cpm: Fix build break due to incompatible pointer types |
| |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| |
| commit 609d5a1b2b35bb62b4b3750396e55453160c2a17 upstream. |
| |
| Since commit ea8daa7b9784 ("kbuild: Add option to turn incompatible |
| pointer check into error"), assignments from an incompatible pointer |
| types have become a hard error, eg: |
| |
| drivers/i2c/busses/i2c-cpm.c:545:91: error: passing argument 3 of |
| 'dma_alloc_coherent' from incompatible pointer type |
| |
| Fix the build break by converting txdma & rxdma to dma_addr_t. |
| |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Wolfram Sang <wsa@the-dreams.de> |
| Fixes: ea8daa7b9784 |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/i2c/busses/i2c-cpm.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/i2c/busses/i2c-cpm.c |
| +++ b/drivers/i2c/busses/i2c-cpm.c |
| @@ -120,8 +120,8 @@ struct cpm_i2c { |
| cbd_t __iomem *rbase; |
| u_char *txbuf[CPM_MAXBD]; |
| u_char *rxbuf[CPM_MAXBD]; |
| - u32 txdma[CPM_MAXBD]; |
| - u32 rxdma[CPM_MAXBD]; |
| + dma_addr_t txdma[CPM_MAXBD]; |
| + dma_addr_t rxdma[CPM_MAXBD]; |
| }; |
| |
| static irqreturn_t cpm_i2c_interrupt(int irq, void *dev_id) |
