[PATCH] i2c: cpm: Fix build break due to incompatible pointer types

[PATCH] i2c: cpm: Fix build break due to incompatible pointer types

[Michael Ellerman]

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>
---
 drivers/i2c/busses/i2c-cpm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

*** Build tested only.

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 714bdc837769..b167ab25310a 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -116,8 +116,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)
-- 
2.5.0

Re: [PATCH] i2c: cpm: Fix build break due to incompatible pointer types

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 548 bytes --]

On Wed, Apr 13, 2016 at 01:59:14PM +1000, Michael Ellerman wrote:
> 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>

Applied to for-current, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]