lkml.org 
[lkml]   [2020]   [Jun]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH 4.19 182/267] spi: dw: Return any value retrieved from the dma_transfer callback
    Hi Sasha,

    On Fri, Jun 26, 2020 at 04:07:10PM -0400, Sasha Levin wrote:
    >On Fri, Jun 26, 2020 at 11:18:00AM -0400, Ralph Siemsen wrote:
    >>
    >>So the following patch is needed as well, at least in 4.9 and 4.19,
    >>I did not check/test other versions. Mainline does not need this,
    >>since the code seems to have been refactored to avoid the
    >>duplication.
    >
    >Could you add your signed-off-by tag please? :)

    Whoops, for some reason I snipped it out... sorry about that!
    Here it is again, with the commit message tweaked for clarity.

    Subject: [PATCH] spi: dw: Fix return value of dma_transfer callback

    Earlier commit "spi: dw: Return any value retrieved from the
    dma_transfer callback" changed the return code of mid_spi_dma_transfer()
    from 0 to 1 in drivers/spi/spi-dw-mid.c.

    A similar change is needed spi-dw-mmio.c for mmio_spi_dma_transfer()
    function. Note this only applies to older branches, as mainline has
    refactored the code to avoid duplication.

    Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org>
    ---
    drivers/spi/spi-dw-mmio.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c
    index c563c2815093..99641c485288 100644
    --- a/drivers/spi/spi-dw-mmio.c
    +++ b/drivers/spi/spi-dw-mmio.c
    @@ -358,7 +358,7 @@ static int mmio_spi_dma_transfer(struct dw_spi *dws, struct spi_transfer *xfer)
    dma_async_issue_pending(dws->txchan);
    }

    - return 0;
    + return 1;
    }

    static void mmio_spi_dma_stop(struct dw_spi *dws)
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-06-27 20:22    [W:3.364 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site