* dmaengine: ioat: fix prototype of ioat_enumerate_channels
@ 2018-10-05 14:24 Vinod Koul
0 siblings, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2018-10-05 14:24 UTC (permalink / raw)
To: Rami Rosen; +Cc: dmaengine, dave.jiang, dan.j.williams
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* dmaengine: ioat: fix prototype of ioat_enumerate_channels
@ 2018-10-04 21:03 Rami Rosen
0 siblings, 0 replies; 5+ messages in thread
From: Rami Rosen @ 2018-10-04 21:03 UTC (permalink / raw)
To: dmaengine; +Cc: vkoul, dave.jiang, dan.j.williams, Rami Rosen
Signed-off-by: Rami Rosen <ramirose@gmail.com>
---
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 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;
}
/**
^ permalink raw reply related [flat|nested] 5+ messages in thread
* dmaengine: ioat: fix prototype of ioat_enumerate_channels
@ 2018-10-02 14:52 Vinod Koul
0 siblings, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2018-10-02 14:52 UTC (permalink / raw)
To: Rami Rosen; +Cc: dmaengine, dave.jiang, dan.j.williams
On 27-09-18, 07:02, Rami Rosen wrote:
> This patch changes the return type of the static method
> ioat_init_channel() to be void. There is no need for
> this method to retrun any value, and the return
> value of this static method is not used anyhow.
> (Setting dma->chancnt is enough).
Sorry am not able to apply this, can you rebase on dmaengine-next and
resend
^ permalink raw reply [flat|nested] 5+ messages in thread
* dmaengine: ioat: fix prototype of ioat_enumerate_channels
@ 2018-09-27 15:41 Dave Jiang
0 siblings, 0 replies; 5+ messages in thread
From: Dave Jiang @ 2018-09-27 15:41 UTC (permalink / raw)
To: Rami Rosen, dmaengine; +Cc: dan.j.williams
On 09/26/2018 09:02 PM, Rami Rosen wrote:
> This patch changes the return type of the static method
> ioat_init_channel() to be void. There is no need for
> this method to retrun any value, and the return
> value of this static method is not used anyhow.
> (Setting dma->chancnt is enough).
>
> Signed-off-by: Rami Rosen <ramirose@gmail.com>
Acked-by: Dave Jiang <dave.jiang@intel.com>
> ---
> 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 4fa4c06c9edb..c5aff6fa5ba2 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;
> }
>
> /**
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* dmaengine: ioat: fix prototype of ioat_enumerate_channels
@ 2018-09-27 4:02 Rami Rosen
0 siblings, 0 replies; 5+ messages in thread
From: Rami Rosen @ 2018-09-27 4:02 UTC (permalink / raw)
To: dmaengine; +Cc: dave.jiang, dan.j.williams, Rami Rosen
This patch changes the return type of the static method
ioat_init_channel() to be void. There is no need for
this method to retrun any value, and the return
value of this static method is not used anyhow.
(Setting dma->chancnt is enough).
Signed-off-by: Rami Rosen <ramirose@gmail.com>
---
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 4fa4c06c9edb..c5aff6fa5ba2 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;
}
/**
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-10-05 14:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-05 14:24 dmaengine: ioat: fix prototype of ioat_enumerate_channels Vinod Koul
-- strict thread matches above, loose matches on Subject: below --
2018-10-04 21:03 Rami Rosen
2018-10-02 14:52 Vinod Koul
2018-09-27 15:41 Dave Jiang
2018-09-27 4:02 Rami Rosen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.