lkml.org 
[lkml]   [2016]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.5 105/200] i2c: cpm: Fix build break due to incompatible pointer types
    Date
    4.5-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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
    @@ -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)

    \
     
     \ /
      Last update: 2016-05-03 03:21    [W:4.089 / U:0.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site