2017-12-11 14:00:48

by Venkat Prashanth B U

Subject: [PATCH] DMA:omap-dma: Fix kernel compilation error and checkpatch issues

From: Venkat Prashanth B U <[email protected]>

This is the patch to the omap-dma.c file that fixes
the following issues:

1.redefinition of 'omap_dma_filter_fn' in the line 1273
of drivers/dma/omap-dma.c

2.drivers/dma/omap-dma.c:341: ERROR: code indent should
use tabs where possible reported by ./checkpatch.pl

3.drivers/dma/omap-dma.c:749: WARNING: Missing a blank
line after declarations reported by ./checkpatch.pl

Signed-off-by: Venkat Prashanth B U <[email protected]>
---
drivers/dma/omap-dma.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index 1dfc71c..2a40485 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -338,7 +338,7 @@ static void omap_dma_stop(struct omap_chan *c)
if (val & (CCR_RD_ACTIVE | CCR_WR_ACTIVE))
dev_err(c->vc.chan.device->dev,
"DMA drain did not complete on lch %d\n",
- c->dma_ch);
+ c->dma_ch);

omap_dma_glbl_write(od, OCP_SYSCONFIG, sysconfig);
} else {
@@ -746,6 +746,7 @@ static void omap_dma_issue_pending(struct dma_chan *chan)
*/
if (!c->cyclic) {
struct omap_dmadev *d = to_omap_dma_dev(chan->device);
+
spin_lock(&d->lock);
if (list_empty(&c->node))
list_add_tail(&c->node, &d->pending);
@@ -1269,7 +1270,7 @@ static struct platform_driver omap_dma_driver = {
},
};

-bool omap_dma_filter_fn(struct dma_chan *chan, void *param)
+bool omap_dma_filter_func(struct dma_chan *chan, void *param)
{
if (chan->device->dev->driver == &omap_dma_driver.driver) {
struct omap_dmadev *od = to_omap_dma_dev(chan->device);
--
1.9.1

2017-12-11 16:38:02

by Vinod Koul

Subject: Re: [PATCH] DMA:omap-dma: Fix kernel compilation error and checkpatch issues

On Mon, Dec 11, 2017 at 07:30:33PM +0530, [email protected] wrote:
> From: Venkat Prashanth B U <[email protected]>
>
> This is the patch to the omap-dma.c file that fixes
> the following issues:

Thanks Venkat for the patch, but unforntunately it has some issues.

First a patch should do only one thing, here it is attempting to do 3
things. I would urge you to read up on Documentation/process/* files. They
should help and feel free to ask.

Also title should document the patch, what it does and not fixes.

> 1.redefinition of 'omap_dma_filter_fn' in the line 1273
> of drivers/dma/omap-dma.c

This one actually sounds okay

> 2.drivers/dma/omap-dma.c:341: ERROR: code indent should
> use tabs where possible reported by ./checkpatch.pl
>
> 3.drivers/dma/omap-dma.c:749: WARNING: Missing a blank
> line after declarations reported by ./checkpatch.pl

I typically dont take ./checkpatch.pl fixes as this causes many issues like
backporting on stable. So please drop these

>
> Signed-off-by: Venkat Prashanth B U <[email protected]>
> ---
> drivers/dma/omap-dma.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
> index 1dfc71c..2a40485 100644
> --- a/drivers/dma/omap-dma.c
> +++ b/drivers/dma/omap-dma.c
> @@ -338,7 +338,7 @@ static void omap_dma_stop(struct omap_chan *c)
> if (val & (CCR_RD_ACTIVE | CCR_WR_ACTIVE))
> dev_err(c->vc.chan.device->dev,
> "DMA drain did not complete on lch %d\n",
> - c->dma_ch);
> + c->dma_ch);
>
> omap_dma_glbl_write(od, OCP_SYSCONFIG, sysconfig);
> } else {
> @@ -746,6 +746,7 @@ static void omap_dma_issue_pending(struct dma_chan *chan)
> */
> if (!c->cyclic) {
> struct omap_dmadev *d = to_omap_dma_dev(chan->device);
> +
> spin_lock(&d->lock);
> if (list_empty(&c->node))
> list_add_tail(&c->node, &d->pending);
> @@ -1269,7 +1270,7 @@ static struct platform_driver omap_dma_driver = {
> },
> };
>
> -bool omap_dma_filter_fn(struct dma_chan *chan, void *param)
> +bool omap_dma_filter_func(struct dma_chan *chan, void *param)
> {
> if (chan->device->dev->driver == &omap_dma_driver.driver) {
> struct omap_dmadev *od = to_omap_dma_dev(chan->device);
> --
> 1.9.1
>

--
~Vinod