Commits · 0a9e58d6e68f1656be234e92a4eeae8f98dd4dd1 · Kirill Smelkov / linux

16 Jul, 2014 40 commits

staging: comedi: amplc_pci230: checkpatch.pl cleanup (void function return) · 0a9e58d6

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning in this file:

WARNING: void function return statements are not generally useful
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

0a9e58d6

staging: comedi: amplc_pc236: checkpatch.pl cleanup (missing blank line) · ec05d98c

H Hartley Sweeten authored Jul 16, 2014

Fix this checkpatch.pl warning:

WARNING: Missing a blank line after declarations
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

ec05d98c

staging: comedi: adv_pci1723: checkpatch.pl cleanup (missing blank line) · c6d94c74

H Hartley Sweeten authored Jul 16, 2014

Fix this checkpatch.pl warning:

WARNING: Missing a blank line after declarations
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

c6d94c74

staging: comedi: 8253.h: checkpatch.pl cleanup (void function return) · 214c043f

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning in this file:

WARNING: void function return statements are not generally useful
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

214c043f

Staging: adl_pci9118: a language issue fixed · 2cbc7a3f

Sam Asadi authored Jul 16, 2014

For better use of English, 'mixtured' which is not right, replaced
by 'mixed'.
Signed-off-by: Sam Asadi <asadi.samuel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2cbc7a3f

staging: comedi: mite.h: tidy up mite_csigr_wpdep() · 3176b5e9

H Hartley Sweeten authored Jul 16, 2014

Refactor this inline function to fix the checkpatch.pl warnings:

WARNING: Missing a blank line after declarations
WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

3176b5e9

staging: comedi: ni_tio_internal.c: checkpatch.pl cleanup (break is not useful) · 1ba75774

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: break is not useful after a goto or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1ba75774

staging: comedi: das08: checkpatch.pl cleanup (break is not useful) · a8b6c4f5

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: break is not useful after a goto or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

a8b6c4f5

staging: comedi: ni_labpc: checkpatch.pl cleanup (else is not useful) · d88e3da9

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

d88e3da9

staging: comedi: ni_tiocmd: checkpatch.pl cleanup (break is not useful) · 1c6820bc

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: break is not useful after a goto or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1c6820bc

staging: comedi: ni_tio: checkpatch.pl cleanup (else is not useful) · 89660697

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warnings:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

89660697

staging: comedi: ni_tio: checkpatch.pl cleanup (break is not useful) · 9bad9133

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warnings:

WARNING: break is not useful after a goto or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

9bad9133

staging: comedi: usbduxsigma: checkpatch.pl cleanup (else not useful) · 182157e1

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

182157e1

staging: comedi: usbdux: checkpatch.pl cleanup (else not useful) · ce1d67ac

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

ce1d67ac

staging: comedi: ni_mio_common: checkpatch.pl cleanup (else not useful) · 0953ee4a

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warnings:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

0953ee4a

staging: comedi: ni_mio_common: checkpatch.pl cleanup (break not useful) · 95940961

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: break is not useful after a goto or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

95940961

staging: comedi: s626: checkpatch.pl cleanup (else not useful) · 193725ba

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

193725ba

staging: comedi: ni_660x: checkpatch.pl cleanup (else not useful) · f9558b49

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

f9558b49

staging: comedi: ni_660x: checkpatch.pl cleanup (break not useful) · eb8051d7

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warnings:

WARNING: break is not useful after a goto or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

eb8051d7

staging: comedi: cb_pcidas: checkpatch.pl cleanup (break not useful) · 57ec1abf

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warnings:

WARNING: break is not useful after a goto or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

57ec1abf

staging: comedi: cb_pcidas64: checkpatch.pl cleanup (break not useful) · f1051676

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warnings:

WARNING: break is not useful after a goto or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

f1051676

staging: comedi: s526: checkpatch.pl cleanup (break not useful) · ee99bcc7

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: break is not useful after a goto or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

ee99bcc7

staging: comedi: ni_at_a2150: checkpatch.pl cleanup (break not useful) · 1c404be2

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: break is not useful after a goto or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1c404be2

staging: comedi: das1800: checkpatch.pl cleanup (break not useful) · f8d17129

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warnings:

WARNING: break is not useful after a goto or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

f8d17129

staging: comedi: pcl724: checkpatch.pl cleanup (else after return) · eeb3b4f9

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

eeb3b4f9

staging: comedi: dt282x: checkpatch.pl cleanup (else after return) · aa299845

H Hartley Sweeten authored Jul 16, 2014

Fix checkpatch.pl warning:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

aa299845

staging: comedi: daqboard2000: checkpatch.pl cleanup (else after return) · 02efdb3b

H Hartley Sweeten authored Jul 16, 2014

Fix these checkpatch.pl warnings:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

02efdb3b

staging: comedi: cb_pcidas64: checkpatch.pl cleanup (else after return) · 4ffeead3

H Hartley Sweeten authored Jul 16, 2014

Fix these checkpatch.pl warnings:

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

Also, remove an unnecessary trailing ';' at the end of a function.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

4ffeead3

staging: comedi: amplc_pci224: checkpatch.pl cleanup (else after return) · 34880ec7

H Hartley Sweeten authored Jul 16, 2014

Fix this checkpatch.pl warning:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

34880ec7

staging: comedi: amplc_pc236: checkpatch.pl cleanup (else after return) · c3ba2678

H Hartley Sweeten authored Jul 16, 2014

Fix these checkpatch.pl warnings:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

c3ba2678

staging: comedi: amplc_dio200_common: checkpatch.pl cleanup (else after return) · 18a8e8c5

H Hartley Sweeten authored Jul 16, 2014

Fix these checkpatch.pl warnings:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

18a8e8c5

staging: comedi: addi_apci_3xxx: checkpatch.pl cleanup (else after return) · 9ed221fa

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning in this file:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

9ed221fa

staging: comedi: 8255: checkpatch.pl cleanup (else after return) · 8ed43d77

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning in this file:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

8ed43d77

staging: comedi: 8255_pci: checkpatch.pl cleanup (else after return) · c2c99c7f

H Hartley Sweeten authored Jul 16, 2014

Fix the checkpatch.pl warning in this file:

WARNING: else is not generally useful after a break or return
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

c2c99c7f

Staging: comedi: adl_pci9118: fractured spelling fixed · 08aa7549

Sam Asadi authored Jul 16, 2014

a fractured spelling in previous style issue fix mended.
Signed-off-by: Sam Asadi <asadi.samuel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

08aa7549

Staging: comedi: adl_pci9118: a style issue fixed · b86bc990

Sam Asadi authored Jul 16, 2014

'quoted string split across lines' warning in checkpatching fixed
by group whole string in one line.
Signed-off-by: Sam Asadi <asadi.samuel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

b86bc990

Staging: vt6655: fix missing blank line after variable declaration · f9dc1a8a

Igor Bezukh authored Jul 16, 2014

Checkpatch fix - Add missing blank line after variable declaration
Signed-off-by: Igor Bezukh <igbzkh@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

f9dc1a8a

staging: vt6556: Replace printk by dev_warn · d9cf2f9e

Peter Senna Tschudin authored Jul 16, 2014

This patch fixes a checkpatch warning by replacing printk
by dev_warn. Tested by compilation only.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

d9cf2f9e

staging: vt6556: Remove typedefs · 879be45a

Peter Senna Tschudin authored Jul 16, 2014

This patch removes uneeded typedefs reported by chackpatch and removes
one enum that is not in use. As checkpatch complained about the typedef
and the enum is not being used, this patch removes both typedef and enum.
The removed enum from card.h:

typedef enum _CARD_PHY_TYPE {
    PHY_TYPE_AUTO = 0,
    PHY_TYPE_11B,
    PHY_TYPE_11G,
    PHY_TYPE_11A
} CARD_PHY_TYPE, *PCARD_PHY_TYPE;

The following typedefs were removed, but enums were kept at device.h:

 typedef enum __device_msg_level
 typedef enum __DEVICE_NDIS_STATUS

Tested by compilation only.
Signed-off-by: Peter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

879be45a

staging: xillybus: fix some coding style errors · 91d42194

Vincent Bernat authored Jul 16, 2014

This includes:
 - keep "else" on the same line as the closing brace
 - don't use "else" after "return"
 - don't issue a message for an out-of-memory error
 - blank line after a declaration
Signed-off-by: Vincent Bernat <vincent@bernat.im>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

91d42194