lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 074/122] dmaengine: ioat: fix prototype of ioat_enumerate_channels
    Date
    From: Rami Rosen <ramirose@gmail.com>

    [ Upstream commit f4d34aa8c887a8a2d23ef546da0efa10e3f77241 ]

    Signed-off-by: Rami Rosen <ramirose@gmail.com>
    Signed-off-by: Vinod Koul <vkoul@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/dma/ioat/init.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c
    index 68680e4151eaa..9103a0425f752 100644
    --- a/drivers/dma/ioat/init.c
    +++ b/drivers/dma/ioat/init.c
    @@ -129,7 +129,7 @@ static void
    ioat_init_channel(struct ioatdma_device *ioat_dma,
    struct ioatdma_chan *ioat_chan, int idx);
    static void ioat_intr_quirk(struct ioatdma_device *ioat_dma);
    -static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma);
    +static void ioat_enumerate_channels(struct ioatdma_device *ioat_dma);
    static int ioat3_dma_self_test(struct ioatdma_device *ioat_dma);

    static int ioat_dca_enabled = 1;
    @@ -575,7 +575,7 @@ static void ioat_dma_remove(struct ioatdma_device *ioat_dma)
    * ioat_enumerate_channels - find and initialize the device's channels
    * @ioat_dma: the ioat dma device to be enumerated
    */
    -static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma)
    +static void ioat_enumerate_channels(struct ioatdma_device *ioat_dma)
    {
    struct ioatdma_chan *ioat_chan;
    struct device *dev = &ioat_dma->pdev->dev;
    @@ -594,7 +594,7 @@ static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma)
    xfercap_log = readb(ioat_dma->reg_base + IOAT_XFERCAP_OFFSET);
    xfercap_log &= 0x1f; /* bits [4:0] valid */
    if (xfercap_log == 0)
    - return 0;
    + return;
    dev_dbg(dev, "%s: xfercap = %d\n", __func__, 1 << xfercap_log);

    for (i = 0; i < dma->chancnt; i++) {
    @@ -611,7 +611,6 @@ static int ioat_enumerate_channels(struct ioatdma_device *ioat_dma)
    }
    }
    dma->chancnt = i;
    - return i;
    }

    /**
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-11-22 12:14    [W:4.125 / U:0.992 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site