diff mbox

dma: fix returnvar.cocci warnings

Message ID alpine.DEB.2.10.1511080843100.2637@hadrien (mailing list archive)
State Not Applicable
Headers show

Commit Message

Julia Lawall Nov. 8, 2015, 7:45 a.m. UTC
Remove unneeded variable used to store return value.

Generated by: scripts/coccinelle/misc/returnvar.cocci

CC: Sinan Kaya <okaya@codeaurora.org>
Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
---

 hidma_ll.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Andy Shevchenko Nov. 8, 2015, 9:15 p.m. UTC | #1
On Sun, Nov 8, 2015 at 9:45 AM, Julia Lawall <julia.lawall@lip6.fr> wrote:
>  Remove unneeded variable used to store return value.
>
> Generated by: scripts/coccinelle/misc/returnvar.cocci
>
> CC: Sinan Kaya <okaya@codeaurora.org>
> Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>

Who is the author?
I suppose Fengguang is the reporter, right?

> ---
>
>  hidma_ll.c |    6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> --- a/drivers/dma/qcom/hidma_ll.c
> +++ b/drivers/dma/qcom/hidma_ll.c
> @@ -567,14 +567,13 @@ int hidma_ll_resume(struct hidma_lldev *
>
>  static int hidma_ll_hw_start(struct hidma_lldev *lldev)
>  {
> -       int rc = 0;
>         unsigned long irqflags;
>
>         spin_lock_irqsave(&lldev->lock, irqflags);
>         writel(lldev->tre_write_offset, lldev->trca + TRCA_DOORBELL_OFFSET);
>         spin_unlock_irqrestore(&lldev->lock, irqflags);
>
> -       return rc;
> +       return 0;
>  }
>
>  bool hidma_ll_isenabled(struct hidma_lldev *lldev)
> @@ -600,7 +599,6 @@ bool hidma_ll_isenabled(struct hidma_lld
>  int hidma_ll_queue_request(struct hidma_lldev *lldev, u32 tre_ch)
>  {
>         struct hidma_tre *tre;
> -       int rc = 0;
>         unsigned long flags;
>
>         tre = &lldev->trepool[tre_ch];
> @@ -618,7 +616,7 @@ int hidma_ll_queue_request(struct hidma_
>         lldev->tre_write_offset = (lldev->tre_write_offset + TRE_SIZE)
>                                 % lldev->tre_ring_size;
>         spin_unlock_irqrestore(&lldev->lock, flags);
> -       return rc;
> +       return 0;
>  }
>
>  int hidma_ll_start(struct hidma_lldev *lldev)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
Julia Lawall Nov. 8, 2015, 9:17 p.m. UTC | #2
On Sun, 8 Nov 2015, Andy Shevchenko wrote:

> On Sun, Nov 8, 2015 at 9:45 AM, Julia Lawall <julia.lawall@lip6.fr> wrote:
> >  Remove unneeded variable used to store return value.
> >
> > Generated by: scripts/coccinelle/misc/returnvar.cocci
> >
> > CC: Sinan Kaya <okaya@codeaurora.org>
> > Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>

Signed-off-by: Julia Lawall <julia.lawall@lip6.fr>

Sorry for the oversight.

julia

>
> Who is the author?
> I suppose Fengguang is the reporter, right?
>
> > ---
> >
> >  hidma_ll.c |    6 ++----
> >  1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > --- a/drivers/dma/qcom/hidma_ll.c
> > +++ b/drivers/dma/qcom/hidma_ll.c
> > @@ -567,14 +567,13 @@ int hidma_ll_resume(struct hidma_lldev *
> >
> >  static int hidma_ll_hw_start(struct hidma_lldev *lldev)
> >  {
> > -       int rc = 0;
> >         unsigned long irqflags;
> >
> >         spin_lock_irqsave(&lldev->lock, irqflags);
> >         writel(lldev->tre_write_offset, lldev->trca + TRCA_DOORBELL_OFFSET);
> >         spin_unlock_irqrestore(&lldev->lock, irqflags);
> >
> > -       return rc;
> > +       return 0;
> >  }
> >
> >  bool hidma_ll_isenabled(struct hidma_lldev *lldev)
> > @@ -600,7 +599,6 @@ bool hidma_ll_isenabled(struct hidma_lld
> >  int hidma_ll_queue_request(struct hidma_lldev *lldev, u32 tre_ch)
> >  {
> >         struct hidma_tre *tre;
> > -       int rc = 0;
> >         unsigned long flags;
> >
> >         tre = &lldev->trepool[tre_ch];
> > @@ -618,7 +616,7 @@ int hidma_ll_queue_request(struct hidma_
> >         lldev->tre_write_offset = (lldev->tre_write_offset + TRE_SIZE)
> >                                 % lldev->tre_ring_size;
> >         spin_unlock_irqrestore(&lldev->lock, flags);
> > -       return rc;
> > +       return 0;
> >  }
> >
> >  int hidma_ll_start(struct hidma_lldev *lldev)
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at  http://www.tux.org/lkml/
>
>
>
> --
> With Best Regards,
> Andy Shevchenko
>
--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Julia Lawall Nov. 8, 2015, 9:19 p.m. UTC | #3
On Sun, 8 Nov 2015, Andy Shevchenko wrote:

> On Sun, Nov 8, 2015 at 9:45 AM, Julia Lawall <julia.lawall@lip6.fr> wrote:
> >  Remove unneeded variable used to store return value.
> >
> > Generated by: scripts/coccinelle/misc/returnvar.cocci
> >
> > CC: Sinan Kaya <okaya@codeaurora.org>
> > Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
>
> Who is the author?
> I suppose Fengguang is the reporter, right?

There is no human author...  But normally when I check these I add a
signed off by line to them.

julia

>
> > ---
> >
> >  hidma_ll.c |    6 ++----
> >  1 file changed, 2 insertions(+), 4 deletions(-)
> >
> > --- a/drivers/dma/qcom/hidma_ll.c
> > +++ b/drivers/dma/qcom/hidma_ll.c
> > @@ -567,14 +567,13 @@ int hidma_ll_resume(struct hidma_lldev *
> >
> >  static int hidma_ll_hw_start(struct hidma_lldev *lldev)
> >  {
> > -       int rc = 0;
> >         unsigned long irqflags;
> >
> >         spin_lock_irqsave(&lldev->lock, irqflags);
> >         writel(lldev->tre_write_offset, lldev->trca + TRCA_DOORBELL_OFFSET);
> >         spin_unlock_irqrestore(&lldev->lock, irqflags);
> >
> > -       return rc;
> > +       return 0;
> >  }
> >
> >  bool hidma_ll_isenabled(struct hidma_lldev *lldev)
> > @@ -600,7 +599,6 @@ bool hidma_ll_isenabled(struct hidma_lld
> >  int hidma_ll_queue_request(struct hidma_lldev *lldev, u32 tre_ch)
> >  {
> >         struct hidma_tre *tre;
> > -       int rc = 0;
> >         unsigned long flags;
> >
> >         tre = &lldev->trepool[tre_ch];
> > @@ -618,7 +616,7 @@ int hidma_ll_queue_request(struct hidma_
> >         lldev->tre_write_offset = (lldev->tre_write_offset + TRE_SIZE)
> >                                 % lldev->tre_ring_size;
> >         spin_unlock_irqrestore(&lldev->lock, flags);
> > -       return rc;
> > +       return 0;
> >  }
> >
> >  int hidma_ll_start(struct hidma_lldev *lldev)
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at  http://www.tux.org/lkml/
>
>
>
> --
> With Best Regards,
> Andy Shevchenko
>
--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Timur Tabi Nov. 8, 2015, 9:19 p.m. UTC | #4
Andy Shevchenko wrote:
>> >CC: Sinan Kaya<okaya@codeaurora.org>
>> >Signed-off-by: Fengguang Wu<fengguang.wu@intel.com>
> Who is the author?
> I suppose Fengguang is the reporter, right?
>

These are Julia Lawall's coccinelle scripts that automatically run on 
patches and report problems.  Just treat them like normal code reviews 
and incorporate the change in the next version of your patch.
Daniel K. Nov. 8, 2015, 9:39 p.m. UTC | #5
On 11/08/2015 07:45 AM, Julia Lawall wrote:
>  Remove unneeded variable used to store return value.
> 
> --- a/drivers/dma/qcom/hidma_ll.c
> +++ b/drivers/dma/qcom/hidma_ll.c
> @@ -567,14 +567,13 @@ int hidma_ll_resume(struct hidma_lldev *
> 
>  static int hidma_ll_hw_start(struct hidma_lldev *lldev)
>  {
> -	int rc = 0;
>  	unsigned long irqflags;
> 
>  	spin_lock_irqsave(&lldev->lock, irqflags);
>  	writel(lldev->tre_write_offset, lldev->trca + TRCA_DOORBELL_OFFSET);
>  	spin_unlock_irqrestore(&lldev->lock, irqflags);
> 
> -	return rc;
> +	return 0;
>  }
> 
>  bool hidma_ll_isenabled(struct hidma_lldev *lldev)

Seems rather pointless, what about 'static void ...' and dropping the
return statement?


Daniel K.

--
To unsubscribe from this list: send the line "unsubscribe dmaengine" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sinan Kaya Nov. 8, 2015, 10 p.m. UTC | #6
On 11/8/2015 4:39 PM, Daniel K. wrote:
> On 11/08/2015 07:45 AM, Julia Lawall wrote:
>>   Remove unneeded variable used to store return value.
>>
>> --- a/drivers/dma/qcom/hidma_ll.c
>> +++ b/drivers/dma/qcom/hidma_ll.c
>> @@ -567,14 +567,13 @@ int hidma_ll_resume(struct hidma_lldev *
>>
>>   static int hidma_ll_hw_start(struct hidma_lldev *lldev)
>>   {
>> -	int rc = 0;
>>   	unsigned long irqflags;
>>
>>   	spin_lock_irqsave(&lldev->lock, irqflags);
>>   	writel(lldev->tre_write_offset, lldev->trca + TRCA_DOORBELL_OFFSET);
>>   	spin_unlock_irqrestore(&lldev->lock, irqflags);
>>
>> -	return rc;
>> +	return 0;
>>   }
>>
>>   bool hidma_ll_isenabled(struct hidma_lldev *lldev)
>
> Seems rather pointless, what about 'static void ...' and dropping the
> return statement?
>
>
> Daniel K.
>

Yes, that's what I ended up doing. rc was forgotten there because I had 
to restructure code to use the issue_pending API.
diff mbox

Patch

--- a/drivers/dma/qcom/hidma_ll.c
+++ b/drivers/dma/qcom/hidma_ll.c
@@ -567,14 +567,13 @@  int hidma_ll_resume(struct hidma_lldev *

 static int hidma_ll_hw_start(struct hidma_lldev *lldev)
 {
-	int rc = 0;
 	unsigned long irqflags;

 	spin_lock_irqsave(&lldev->lock, irqflags);
 	writel(lldev->tre_write_offset, lldev->trca + TRCA_DOORBELL_OFFSET);
 	spin_unlock_irqrestore(&lldev->lock, irqflags);

-	return rc;
+	return 0;
 }

 bool hidma_ll_isenabled(struct hidma_lldev *lldev)
@@ -600,7 +599,6 @@  bool hidma_ll_isenabled(struct hidma_lld
 int hidma_ll_queue_request(struct hidma_lldev *lldev, u32 tre_ch)
 {
 	struct hidma_tre *tre;
-	int rc = 0;
 	unsigned long flags;

 	tre = &lldev->trepool[tre_ch];
@@ -618,7 +616,7 @@  int hidma_ll_queue_request(struct hidma_
 	lldev->tre_write_offset = (lldev->tre_write_offset + TRE_SIZE)
 				% lldev->tre_ring_size;
 	spin_unlock_irqrestore(&lldev->lock, flags);
-	return rc;
+	return 0;
 }

 int hidma_ll_start(struct hidma_lldev *lldev)