staging: comedi: Remove semicolon after if.
PATCH 1/1 staging: comedi: Remove semicolon after if.
This patch removes a semicolon after if and encloses statements related to that if in brackets. The following coccinelle script was used to detect the pattern of a semicolon after if.
@r1@
position p;
@@
if (...);@p
@script:python@
p0 << r1.p;
@@
// Emacs org-mode outputcocci.print_main("", p0)cocci.print_secs("", p0)
--- drivers/staging/comedi/drivers/das1800.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/comedi/drivers/das1800.c +4 -4
@@ -492,11 +492,11 @@ static void das1800_handle_fifo_not_empty(struct comedi_device *dev,while (inb (dev->iobase +DAS1800_STATUS ) &FNE ) { dpnt =inw (dev->iobase +DAS1800_FIFO );/* convert to unsigned type if we are in a bipolar mode */ -if (!unipolar) - ; - dpnt =munge_bipolar_sample (dev, dpnt); +if (!unipolar) { + dpnt =mungef_bipolar_sample (dev, dpnt);comedi_buf_write_samples (s, &dpnt,1 ); - + } +if (cmd->stop_src ==TRIG_COUNT && s->async->scans_done >= cmd->stop_arg)break ;
Signature · 1 line
1.9.1
Quoted 26 lines · Navya Sri Nizamkari
This patch removes a semicolon after if and encloses statements related to that if in brackets. The following coccinelle script was used to detect the pattern of a semicolon after if.
@r1@
position p;
@@
if (...);@p
@script:python@
p0 << r1.p;
@@
// Emacs org-mode outputcocci.print_main("", p0)cocci.print_secs("", p0)Signed-off-by Navya Sri Nizamkari <[email protected]>--- drivers/staging/comedi/drivers/das1800.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/staging/comedi/drivers/das1800.c +0
-0
drivers/staging/comedi/drivers/das1800.c static void das1800_handle_fifo_not_empty(struct comedi_device *dev, · line 496
Quoted 8 lines
drivers/staging/comedi/drivers/das1800.c +2
-3@@ -492,11 +492,11 @@ static void das1800_handle_fifo_not_empty(struct comedi_device *dev,while (inb (dev->iobase +DAS1800_STATUS ) &FNE ) { dpnt =inw (dev->iobase +DAS1800_FIFO );/* convert to unsigned type if we are in a bipolar mode */ -if (!unipolar) - ; - dpnt =munge_bipolar_sample (dev, dpnt); +if (!unipolar) { + dpnt =mungef_bipolar_sample (dev, dpnt);
You need some indentation here.
julia
Quoted 17 lines
drivers/staging/comedi/drivers/das1800.c +2
-2comedi_buf_write_samples (s, &dpnt,1 ); - + } +if (cmd->stop_src ==TRIG_COUNT && s->async->scans_done >= cmd->stop_arg)break ; --1.9.1
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20150228220347.GA5430%40localhost.
For more options, visit https://groups.google.com/d/optout.
Quoted 9 lines · On Sunday 01 March 2015 16:37:57 Julia Lawall wrote:
drivers/staging/comedi/drivers/das1800.c static void das1800_handle_fifo_not_empty(struct comedi_device *dev, · line 496
Quoted 8 lines
while (inb(dev->iobase + DAS1800_STATUS) & FNE) { dpnt = inw(dev->iobase + DAS1800_FIFO); /* convert to unsigned type if we are in a bipolar mode */drivers/staging/comedi/drivers/das1800.c +2
-3-if (!unipolar) - ; - dpnt =munge_bipolar_sample (dev, dpnt); +if (!unipolar) { + dpnt =mungef_bipolar_sample (dev, dpnt);
Quoted 7 lines
You need some indentation here.
julia
Quoted 3 lines
comedi_buf_write_samples(s, &dpnt, 1);drivers/staging/comedi/drivers/das1800.c +1
-1- + }
It rather looks to me that the patch fundamentally changes the behavior of the function, but calling two functions conditionally that were called unconditionally previously.
There is also a typo in 'mungef_bipolar_sample' that will prevent this from compiling.
Arnd
Quoted 20 lines · Arnd Bergmann
Quoted 3 lines · On Sunday 01 March 2015 16:37:57 Julia Lawall wrote:
Quoted 3 lines
while (inb(dev->iobase + DAS1800_STATUS) & FNE) { dpnt = inw(dev->iobase + DAS1800_FIFO); /* convert to unsigned type if we are in a bipolar mode*/
Quoted 6 lines
drivers/staging/comedi/drivers/das1800.c static void das1800_handle_fifo_not_empty(struct comedi_device *dev, · line 496
Quoted 5 lines
drivers/staging/comedi/drivers/das1800.c +2
-3-if (!unipolar) - ; - dpnt =munge_bipolar_sample (dev, dpnt); +if (!unipolar) { + dpnt =mungef_bipolar_sample (dev, dpnt);Quoted 7 lines
You need some indentation here.
julia
Quoted 3 lines
comedi_buf_write_samples(s, &dpnt, 1);-
+ }
Quoted 9 lines
It rather looks to me that the patch fundamentally changes the behavior of the function, but calling two functions conditionally that were called unconditionally previously.
There is also a typo in '
mungef_bipolar_sample' that will prevent this from compiling.Arnd
If it's changing the way the functions are being called, I'll simply remove the if condition, fix the typo with proper indentation and send a newer version.
Thanks,
Navya
Quoted 28 lines · On Monday 02 March 2015 10:09:38 Navya Sri Nizamkari wrote:
Quoted 27 lines · Arnd Bergmann
Quoted 3 lines · On Sunday 01 March 2015 16:37:57 Julia Lawall wrote:
Quoted 3 lines
while (inb(dev->iobase + DAS1800_STATUS) & FNE) { dpnt = inw(dev->iobase + DAS1800_FIFO); /* convert to unsigned type if we are in a bipolar mode*/
Quoted 6 lines
drivers/staging/comedi/drivers/das1800.c static void das1800_handle_fifo_not_empty(struct comedi_device *dev, · line 496
Quoted 5 lines
drivers/staging/comedi/drivers/das1800.c +2
-3-if (!unipolar) - ; - dpnt =munge_bipolar_sample (dev, dpnt); +if (!unipolar) { + dpnt =mungef_bipolar_sample (dev, dpnt);Quoted 7 lines
You need some indentation here.
julia
Quoted 3 lines
comedi_buf_write_samples(s, &dpnt, 1);-
+ }It rather looks to me that the patch fundamentally changes the behavior of the function, but calling two functions conditionally that were called unconditionally previously.
There is also a typo in '
mungef_bipolar_sample' that will prevent this from compiling.
Quoted 7 lines
Quoted 2 lines
Arnd
If it's changing the way the functions are being called, I'll simply remove the if condition, fix the typo with proper indentation and send a newer version.
Yes, I think that would be ok. This is the sort of code that is clearly bogus, but it's hard to tell why. It was originally written as
if (!unipolar) ;
when the code was initially merged, which was likely already the result of a cleanup gone wrong, and it was later changed to
if (!unipolar) ;
which is obviously still doing nothing, but more obvious at that.
Arnd