[PATCH 03/32] staging: comedi: comedidev.h: checkpatch.pl cleanup (else after return)

2014-07-16 Thread H Hartley Sweeten
Fix the checkpatch.pl warning in this file:

WARNING: else is not generally useful after a break or return

Also, for aesthetics, rename the comedi_subdevice parameter from
'subd' to 's' since this is the norm for comedi source files.

Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
Cc: Ian Abbott abbo...@mev.co.uk
Cc: Greg Kroah-Hartman gr...@linuxfoundation.org
---
 drivers/staging/comedi/comedidev.h | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/comedidev.h 
b/drivers/staging/comedi/comedidev.h
index 6af6467..53095bc 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -397,12 +397,12 @@ static inline unsigned int comedi_offset_munge(struct 
comedi_subdevice *s,
return val ^ s-maxdata ^ (s-maxdata  1);
 }
 
-static inline unsigned int bytes_per_sample(const struct comedi_subdevice 
*subd)
+static inline unsigned int bytes_per_sample(const struct comedi_subdevice *s)
 {
-   if (subd-subdev_flags  SDF_LSAMPL)
+   if (s-subdev_flags  SDF_LSAMPL)
return sizeof(unsigned int);
-   else
-   return sizeof(short);
+
+   return sizeof(short);
 }
 
 /*
-- 
1.9.3

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH 03/32] staging: comedi: comedidev.h: checkpatch.pl cleanup (else after return)

2014-07-16 Thread Greg KH
On Wed, Jul 16, 2014 at 10:43:14AM -0700, H Hartley Sweeten wrote:
 Fix the checkpatch.pl warning in this file:
 
 WARNING: else is not generally useful after a break or return
 
 Also, for aesthetics, rename the comedi_subdevice parameter from
 'subd' to 's' since this is the norm for comedi source files.
 
 Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
 Cc: Ian Abbott abbo...@mev.co.uk
 ---
  drivers/staging/comedi/comedidev.h | 8 
  1 file changed, 4 insertions(+), 4 deletions(-)

Doesn't apply...
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


RE: [PATCH 03/32] staging: comedi: comedidev.h: checkpatch.pl cleanup (else after return)

2014-07-16 Thread Hartley Sweeten
On Wednesday, July 16, 2014 1:34 PM, Greg KH wrote:
 On Wed, Jul 16, 2014 at 10:43:14AM -0700, H Hartley Sweeten wrote:
 Fix the checkpatch.pl warning in this file:
 
 WARNING: else is not generally useful after a break or return
 
 Also, for aesthetics, rename the comedi_subdevice parameter from
 'subd' to 's' since this is the norm for comedi source files.
 
 Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
 Cc: Ian Abbott abbo...@mev.co.uk
 ---
  drivers/staging/comedi/comedidev.h | 8 
  1 file changed, 4 insertions(+), 4 deletions(-)

 Doesn't apply...

Not a problem.

You must have had some other patches that already
fixed this and the first 2 in the series.

I'll make sure to check linux-next to verify that the issues
are resolved.

Regards,
Hartley

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [PATCH 03/32] staging: comedi: comedidev.h: checkpatch.pl cleanup (else after return)

2014-07-16 Thread Greg KH
On Wed, Jul 16, 2014 at 09:27:02PM +, Hartley Sweeten wrote:
 On Wednesday, July 16, 2014 1:34 PM, Greg KH wrote:
  On Wed, Jul 16, 2014 at 10:43:14AM -0700, H Hartley Sweeten wrote:
  Fix the checkpatch.pl warning in this file:
  
  WARNING: else is not generally useful after a break or return
  
  Also, for aesthetics, rename the comedi_subdevice parameter from
  'subd' to 's' since this is the norm for comedi source files.
  
  Signed-off-by: H Hartley Sweeten hswee...@visionengravers.com
  Cc: Ian Abbott abbo...@mev.co.uk
  ---
   drivers/staging/comedi/comedidev.h | 8 
   1 file changed, 4 insertions(+), 4 deletions(-)
 
  Doesn't apply...
 
 Not a problem.
 
 You must have had some other patches that already
 fixed this and the first 2 in the series.

Yes, I think I got them from someone else the other day.

 I'll make sure to check linux-next to verify that the issues
 are resolved.

Thanks, that would be good.

greg k-h
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel