On 05-10-18, 00:03, Rami Rosen wrote:
> Signed-off-by: Rami Rosen <ramirose@xxxxxxxxx>
> ---
> drivers/dma/ioat/init.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
Applied, thanks
>
> diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c
> index 21a5708985bc..0fec3c554fe3 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.17.1
--
~Vinod
