[PATCH] staging: comedi: drivers: rtd520: Removed variables that is never used

[PATCH] staging: comedi: drivers: rtd520: Removed variables that is never used

[Rickard Strandqvist]

Variable ar assigned a value that is never used.
I have also removed all the code that thereby serves no purpose.

This was found using a static code analysis program called cppcheck

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
 drivers/staging/comedi/drivers/rtd520.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 581aa58..305631c 100644
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1031,8 +1031,6 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 {
 	struct rtd_private *devpriv = dev->private;
-	u32 overrun;
-	u16 status;
 
 	/* pacer stop source: SOFTWARE */
 	writel(0, dev->mmio + LAS0_PACER_STOP);
@@ -1040,8 +1038,8 @@ static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
 	writel(0, dev->mmio + LAS0_ADC_CONVERSION);
 	writew(0, dev->mmio + LAS0_IT);
 	devpriv->ai_count = 0;	/* stop and don't transfer any more */
-	status = readw(dev->mmio + LAS0_IT);
-	overrun = readl(dev->mmio + LAS0_OVERRUN) & 0xffff;
+	readw(dev->mmio + LAS0_IT);
+	readl(dev->mmio + LAS0_OVERRUN) & 0xffff;
 	writel(0, dev->mmio + LAS0_ADC_FIFO_CLEAR);
 	return 0;
 }
-- 
1.7.10.4

Re: [PATCH] staging: comedi: drivers: rtd520: Removed variables that is never used

[Ian Abbott]

On 28/01/15 22:38, Rickard Strandqvist wrote:
> Variable ar assigned a value that is never used.
> I have also removed all the code that thereby serves no purpose.
>
> This was found using a static code analysis program called cppcheck
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
> ---
>   drivers/staging/comedi/drivers/rtd520.c |    6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
> index 581aa58..305631c 100644
> --- a/drivers/staging/comedi/drivers/rtd520.c
> +++ b/drivers/staging/comedi/drivers/rtd520.c
> @@ -1031,8 +1031,6 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
>   static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
>   {
>   	struct rtd_private *devpriv = dev->private;
> -	u32 overrun;
> -	u16 status;
>
>   	/* pacer stop source: SOFTWARE */
>   	writel(0, dev->mmio + LAS0_PACER_STOP);
> @@ -1040,8 +1038,8 @@ static int rtd_ai_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
>   	writel(0, dev->mmio + LAS0_ADC_CONVERSION);
>   	writew(0, dev->mmio + LAS0_IT);
>   	devpriv->ai_count = 0;	/* stop and don't transfer any more */
> -	status = readw(dev->mmio + LAS0_IT);
> -	overrun = readl(dev->mmio + LAS0_OVERRUN) & 0xffff;
> +	readw(dev->mmio + LAS0_IT);
> +	readl(dev->mmio + LAS0_OVERRUN) & 0xffff;

The ' & 0xffff' part produces compiler warnings.

Those two lines can be removed.  The values read were previously only 
used in a kernel log message.

>   	writel(0, dev->mmio + LAS0_ADC_FIFO_CLEAR);
>   	return 0;
>   }
>


-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti@mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-