Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47dd538e authored by Rami Rosen's avatar Rami Rosen Committed by Greg Kroah-Hartman
Browse files

dmaengine: ioat: fix prototype of ioat_enumerate_channels 



[ Upstream commit f4d34aa8c887a8a2d23ef546da0efa10e3f77241 ]

Signed-off-by: default avatarRami Rosen <ramirose@gmail.com>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 90d73c1c

drivers/dma/ioat/init.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

}



/**