From: Vinod Koul <vkoul@kernel.org>
To: Rami Rosen <ramirose@gmail.com>
Cc: dmaengine@vger.kernel.org, dave.jiang@intel.com,
dan.j.williams@intel.com
Subject: dmaengine: ioat: fix prototype of ioat_enumerate_channels
Date: Fri, 5 Oct 2018 19:54:47 +0530 [thread overview]
Message-ID: <20181005142447.GK2372@vkoul-mobl> (raw)
On 05-10-18, 00:03, Rami Rosen wrote:
> Signed-off-by: Rami Rosen <ramirose@gmail.com>
> ---
> 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
next reply other threads:[~2018-10-05 14:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-05 14:24 Vinod Koul [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-10-04 21:03 dmaengine: ioat: fix prototype of ioat_enumerate_channels Rami Rosen
2018-10-02 14:52 Vinod Koul
2018-09-27 15:41 Dave Jiang
2018-09-27 4:02 Rami Rosen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181005142447.GK2372@vkoul-mobl \
--to=vkoul@kernel.org \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=ramirose@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox