openwrt/staging/blogic.git
11 years agostaging: usbip: fix sparse warnings regarding endianness
Teodora Baluta [Mon, 4 Nov 2013 11:12:12 +0000 (13:12 +0200)]
staging: usbip: fix sparse warnings regarding endianness

The wHubCharacteristics field in usb_hub_descriptor structure is __le16
so there is no need for cast. The cpu_to_le16 returns a __le16 type for
a u16 type. Used cpu_to_le16 to silence last sparse error.

drivers/staging/usbip/vhci_hcd.c:223:35: warning: incorrect type in assignment (different base types)
drivers/staging/usbip/vhci_hcd.c:223:35:    expected restricted __le16 [usertype] wHubCharacteristics
drivers/staging/usbip/vhci_hcd.c:223:35:    got unsigned short [unsigned] [usertype] <noident>
drivers/staging/usbip/vhci_hcd.c:351:34: warning: incorrect type in assignment (different base types)
drivers/staging/usbip/vhci_hcd.c:351:34:    expected unsigned short [unsigned] [short] [usertype] <noident>
drivers/staging/usbip/vhci_hcd.c:351:34:    got restricted __le16 [usertype] <noident>
drivers/staging/usbip/vhci_hcd.c:352:34: warning: incorrect type in assignment (different base types)
drivers/staging/usbip/vhci_hcd.c:352:34:    expected unsigned short [unsigned] [short] [usertype] <noident>
drivers/staging/usbip/vhci_hcd.c:352:34:    got restricted __le16 [usertype] <noident>
drivers/staging/usbip/vhci_hcd.c:540:36: warning: restricted __le16 degrades to integer

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging:usbip:usbip_common.c: Join quoted string split accross lines
Himangi Saraogi [Sat, 2 Nov 2013 12:08:10 +0000 (17:38 +0530)]
staging:usbip:usbip_common.c: Join quoted string split accross lines

This patch removes the checkpatch.pl warnings "quoted string split accross lines"
in usbip_common.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging:usbip:stub_rx.c: Remove warning quoted string split across lines
Himangi Saraogi [Sat, 2 Nov 2013 12:01:22 +0000 (17:31 +0530)]
staging:usbip:stub_rx.c: Remove warning quoted string split across lines

This patch removes the checkpatch.pl warnings "quoted string split
across lines" in stub_rx.c by merging the quoted strings and the
ensuring that the lines are not more than 80 characters long.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging:wlan-ng:hfa384x.h: remove typedef struct hfa384x_bytestr __packed hfa384x_byt...
Himangi Saraogi [Sat, 2 Nov 2013 12:41:44 +0000 (18:11 +0530)]
staging:wlan-ng:hfa384x.h: remove typedef struct hfa384x_bytestr __packed hfa384x_bytestr_t

This patch removes the checkpatch.pl warning "do not add new typedefs"
and changes all source files that use that typedef. Also lines were
shortened to 80 characters to do away with the checkpatch.pl warning
"line over 80 characters" generated due to replacement of the
hfa384x_bytestr_t by struct hfa384x_bytestr in prism2mgmt.c,
prism2mgmt.h, prism2mib.c, prism2sta.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging:wlan-ng:cfg80211.c: Shorten lines to 80 characters
Himangi Saraogi [Sat, 2 Nov 2013 12:32:38 +0000 (18:02 +0530)]
staging:wlan-ng:cfg80211.c: Shorten lines to 80 characters

This patch removes checkpatch.pl warnings "line over 80 characters" in
cfg80211.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: media: davinci_vpfe:Removed space before semicolon in dm365_ipipe_hw.c
Archana kumari [Sun, 3 Nov 2013 06:21:31 +0000 (11:51 +0530)]
staging: media: davinci_vpfe:Removed space before semicolon in dm365_ipipe_hw.c

This patch fixes "space prohibted before semicolon" warning in dm365_ipipe_hw.cdetected via checkpatch.pl

Signed-off-by: Archana kumari <archanakumari959@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging:media:go7007:saa7134-go7007.c: Remove space before tabs
Himangi Saraogi [Sat, 2 Nov 2013 17:12:22 +0000 (22:42 +0530)]
staging:media:go7007:saa7134-go7007.c: Remove space before tabs

This patch removes the checkpatch.pl warning "please, no space before
tabs" in saa7134-go7007.c by converting space followed by tab to tab
followed by tab.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging:media:go7007:go7007-fw.c: move trailing statement to next line
Himangi Saraogi [Sat, 2 Nov 2013 12:20:56 +0000 (17:50 +0530)]
staging:media:go7007:go7007-fw.c: move trailing statement to next line

This patch removes the checkpatch.pl error "trailing statements should
be on next line" in go7007-fw.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: media: fix space prohibited before semicolon
Ebru Akagunduz [Fri, 1 Nov 2013 17:00:38 +0000 (19:00 +0200)]
Staging: media: fix space prohibited before semicolon

Fix checkpatch.pl issues with space prohibited before semicolon in dm365_ipipe.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: bcm: Fix checkpatch warnings for long lines.
Ingrid Cheung [Sun, 10 Nov 2013 04:02:50 +0000 (23:02 -0500)]
Staging: bcm: Fix checkpatch warnings for long lines.

Fixes multiple checkpatch warnings for long lines in Bcmchar.c.

Signed-off-by: Ingrid Cheung <hi@ingridcheung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: bcm: Fix checkpatch warning for long line.
Ingrid Cheung [Sun, 10 Nov 2013 01:53:21 +0000 (20:53 -0500)]
Staging: bcm: Fix checkpatch warning for long line.

Fixed a line that was over 80 characters in Bcmchar.c.

Signed-off-by: Ingrid Cheung <hi@ingridcheung.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: bcm: fixed space related errors around operators
Nandini Hanumanthagowda [Fri, 1 Nov 2013 18:49:31 +0000 (00:19 +0530)]
staging: bcm: fixed space related errors around operators

removed any prohibited spaces and added required spaces
around operators to follow linux coding style and hence
fixed the checkpatch errors

Signed-off-by: Nandini Hanumanthagowda <nandu.hgowda@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: bcm: removed prohibited space before semicolon
Nandini Hanumanthagowda [Fri, 1 Nov 2013 16:33:55 +0000 (22:03 +0530)]
staging: bcm: removed prohibited space before semicolon

removed prohibited space before semicolon(;) to fix
checkpatch warning

Signed-off-by: Nandini Hanumanthagowda <nandu.hgowda@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: keucr: Fix externs are avoided in smscsi.c
Rashika Kheria [Fri, 1 Nov 2013 13:54:17 +0000 (19:24 +0530)]
Staging: keucr: Fix externs are avoided in smscsi.c

This patch fixes the following checkpatch.pl warning in smscsi.c-
WARNING: externs should be avoided in .c files

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: keucr: Fix externs are avoided in smilsub.c
Rashika Kheria [Fri, 1 Nov 2013 13:51:27 +0000 (19:21 +0530)]
Staging: keucr: Fix externs are avoided in smilsub.c

This patch fixes the following checkpatch.pl warning in smilsub.c-
WARNING: externs should be avoided in .c files

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: keucr: Fix externs are avoided in smilmain.c
Rashika Kheria [Fri, 1 Nov 2013 13:49:57 +0000 (19:19 +0530)]
Staging: keucr: Fix externs are avoided in smilmain.c

This patch fixes the following checkpatch.pl warning in smilmain.c-
WARNING: externs should be avoided in .c files

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: crystalhd: return true and false instead of 1 and 0
Valentina Manea [Fri, 1 Nov 2013 13:03:08 +0000 (15:03 +0200)]
staging: crystalhd: return true and false instead of 1 and 0

This fixes coccinelle error regarding functions that return
bool and return 1 and 0 instead of true and false.

Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: media: lirc: fixed sparse warnings by adding __user annotations in lirc_serial.c
Archana kumari [Fri, 1 Nov 2013 08:35:44 +0000 (14:05 +0530)]
staging: media: lirc: fixed sparse warnings by adding __user annotations in lirc_serial.c

This patch fixes sparse warning by adding __user annotations in
lirc_serial.c

Signed-off-by: Archana kumari <archanakumari959@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6655: remove unneeded semicolon
Teodora Baluta [Sun, 10 Nov 2013 15:12:45 +0000 (17:12 +0200)]
staging: vt6655: remove unneeded semicolon

This patch deletes any unneeded semicolons in driver vt6655 as detected
by coccinelle.

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6655: fix comparison of bool to 0/1
Teodora Baluta [Sun, 10 Nov 2013 15:12:44 +0000 (17:12 +0200)]
staging: vt6655: fix comparison of bool to 0/1

This patch corrects comparison of bool to 0/1 for file
drivers/staging/vt6655/rxtx.c. The following type of coccinelle detected
warnings are silenced:

WARNING: Comparison of bool to 0/1

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6655: fix assignment of bool to 0
Teodora Baluta [Sun, 10 Nov 2013 15:12:43 +0000 (17:12 +0200)]
staging: vt6655: fix assignment of bool to 0

This patch fixes the following warnings detected using coccinelle for
drivers/staging/wmgr.c file:

drivers/staging/vt6655/wmgr.c:2335:1-22: WARNING: Assignment of bool to 0/1
drivers/staging/vt6655/wmgr.c:2338:1-27: WARNING: Assignment of bool to 0/1

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6655: delete explicit comparison to bool
Teodora Baluta [Sun, 10 Nov 2013 15:12:42 +0000 (17:12 +0200)]
staging: vt6655: delete explicit comparison to bool

This patch fixes the following type of coccinelle detected warnings for
driver vt6655:

WARNING: Comparison to bool

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6655: put brace on previous line
Teodora Baluta [Fri, 8 Nov 2013 23:00:03 +0000 (01:00 +0200)]
staging: vt6655: put brace on previous line

Place braces on same line for code statements. Fix the following
checkpatch.pl type of error for drivers/staging/vt6655/bssdb.c file:

ERROR: that open brace { should be on the previous line

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6655: put trailing statements on next line
Teodora Baluta [Fri, 8 Nov 2013 23:00:02 +0000 (01:00 +0200)]
staging: vt6655: put trailing statements on next line

This patch fixes the following type of checkpatch.pl errors in
drivers/staging/vt6655/bssdb.c file:

ERROR: trailing statements should be on next line

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6655: remove braces for single statement blocks
Teodora Baluta [Fri, 8 Nov 2013 23:00:01 +0000 (01:00 +0200)]
staging: vt6655: remove braces for single statement blocks

This patch removes braces for single statement blocks, clearing these
types of checkpatch.pl warnings:

WARNING: braces {} are not necessary for single statement blocks
WARNING: braces {} are not necessary for any arm of this statement

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6655: replace C99 comments wtih C89 comments
Teodora Baluta [Fri, 8 Nov 2013 23:00:00 +0000 (01:00 +0200)]
staging: vt6655: replace C99 comments wtih C89 comments

This patch replaces C99 comments with /* .. */ comments. Any commented
code is deleted.

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6656: fixed whitespace related errors around operators
Nandini Hanumanthagowda [Sun, 3 Nov 2013 13:00:52 +0000 (18:30 +0530)]
staging: vt6656: fixed whitespace related errors around operators

removed prohibited spaces around operators and added required
spaces around operators wherever necessary to fix checkpatch
errors

Signed-off-by: Nandini Hanumanthagowda <nandu.hgowda@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6656: Fix (most) sparse warnings regarding static functions/variables
Valentina Manea [Mon, 4 Nov 2013 08:44:02 +0000 (10:44 +0200)]
staging: vt6656: Fix (most) sparse warnings regarding static functions/variables

This fixes sparse warnings for functions and variables, e.g.:
* drivers/staging/vt6656/card.c:69:11: warning: symbol 'cwRXBCNTSFOff'
was not declared. Should it be static?

Some warnings were false positives, such as:
* drivers/staging/vt6656/dpc.c:249:5: warning: symbol 'RXbBulkInProcessData'
was not declared. Should it be static?

Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: vt6655: fixed sparse warning for static declaration in wpa2.c
Archana kumari [Fri, 1 Nov 2013 06:49:21 +0000 (12:19 +0530)]
staging: vt6655: fixed sparse warning for static declaration in wpa2.c

This patch fixes sparse warning for static declaration in wpa2.c

Signed-off-by: Archana kumari <archanakumari959@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: fix printk() should include kern_ facility level
Ebru Akagunduz [Sun, 10 Nov 2013 17:10:31 +0000 (19:10 +0200)]
Staging: rtl8187se: fix printk() should include kern_ facility level

Fix checkpatch.pl issues with printk() should
include kern_ facility level in r8185b_init.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: lustre: remove initialisation of static variable
Teodora Baluta [Tue, 5 Nov 2013 16:36:47 +0000 (18:36 +0200)]
staging: lustre: remove initialisation of static variable

Fix the following checkpatch.pl error:

ERROR: do not initialise statics to 0 or NULL
+static int       libcfs_nidstring_idx = 0;

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: lustre: place EXPORT_SYMBOL after its function
Teodora Baluta [Tue, 5 Nov 2013 16:36:46 +0000 (18:36 +0200)]
staging: lustre: place EXPORT_SYMBOL after its function

This patch fixes the following type of warnings detected by
checkpatch.pl:

WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: lustre: remove space between function name and open parenthesis
Teodora Baluta [Tue, 5 Nov 2013 16:36:45 +0000 (18:36 +0200)]
staging: lustre: remove space between function name and open parenthesis

This fixes the following checkpatch.pl warnings:

WARNING: space prohibited between function name and open parenthesis '('

Signed-off-by: Teodora Baluta <teobaluta@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging:lustre: Fix plain integer as NULL pointer warning
Dulshani Gunawardhana [Thu, 31 Oct 2013 16:21:32 +0000 (21:51 +0530)]
staging:lustre: Fix plain integer as NULL pointer warning

Fix the sparse warning of 'Using plain integer as NULL pointer' in lproc_lov.c.

Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Remove C99 style commenting
Himangi Saraogi [Sun, 10 Nov 2013 08:56:17 +0000 (14:26 +0530)]
Staging: rtl8187se: Remove C99 style commenting

This patch fixes the checkpatch.pl warning
"do not use C99 // comments"
in ieee80211/ieee80211_softmac.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Fix indentation errors
Himangi Saraogi [Sun, 10 Nov 2013 08:54:44 +0000 (14:24 +0530)]
Staging: rtl8187se: Fix indentation errors

This patch fixes the checkpatch.pl warnings "code indent should use
tabs where possible" in ieee80211/ieee80211_softmac.c.
Also unnecessary blanks lines are removed.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging:rtl8187se: Remove unnecessary braces from if-else statement
Himangi Saraogi [Thu, 7 Nov 2013 21:37:03 +0000 (03:07 +0530)]
Staging:rtl8187se: Remove unnecessary braces from if-else statement

This patch fixes the checkpatch.pl warning
braces {} are not necessary for any arm of this statement
in ieee80211/ieee80211_softmac.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging:rtl8187se: Add space before open parenthesis of if condition
Himangi Saraogi [Thu, 7 Nov 2013 21:36:39 +0000 (03:06 +0530)]
Staging:rtl8187se: Add space before open parenthesis of if condition

This patch fixes the checkpatch.pl warning :
space required before the open parenthesis '('
in ieee80211/ieee80211_softmac.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: use macro IW_HANDLER to initialize r8180_wx_handlers
Ana Rey Botello [Thu, 7 Nov 2013 08:31:21 +0000 (09:31 +0100)]
Staging: rtl8187se: use macro IW_HANDLER to initialize r8180_wx_handlers

Use IW_HANDLER to initialize iw_handler structure like in others wireless
driver.

Acked-by: Pablo Neira Ayuso <pablo@gnumonks.org>
Signed-off-by: Ana Rey <anarey@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging:rtl8187se: Insert spaces after commas
Himangi Saraogi [Wed, 6 Nov 2013 11:26:33 +0000 (16:56 +0530)]
Staging:rtl8187se: Insert spaces after commas

This patch fixes the checkpatch.pl warnings
space required after that ',' in ieee80211/ieee80211_softmac.c

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging:rtl8187se: Use preferred library linux/uaccess.h over asm/uaccess.h
Himangi Saraogi [Wed, 6 Nov 2013 05:40:24 +0000 (11:10 +0530)]
staging:rtl8187se: Use preferred library linux/uaccess.h over asm/uaccess.h

This patch fixes the checkpatch.pl warning "Use #include
<linux/uaccess.h> instead of <asm/uaccess.h>" in
ieee80211/ieee80211_softmac.c .

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging:rtl8187se: Shift open brace of function declarations to next line
Himangi Saraogi [Tue, 5 Nov 2013 22:06:11 +0000 (03:36 +0530)]
staging:rtl8187se: Shift open brace of function declarations to next line

This patch fixes the checkpatch.pl error "open brace '{' following
function declarations go on the next line" in ieee80211_softmac.c.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Fix C99 style commenting in dot11d.h
Himangi Saraogi [Sun, 3 Nov 2013 10:46:14 +0000 (16:16 +0530)]
Staging: rtl8187se: Fix C99 style commenting in dot11d.h

This patch fixes the checkpatch.pl error "do not use C99 // comments"
in ieee80211/dot11d.n.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Remove useless comments in dot11d.c
Rashika Kheria [Sat, 2 Nov 2013 17:35:19 +0000 (23:05 +0530)]
Staging: rtl8187se: Remove useless comments in dot11d.c

This patch removes unnecessary comments in ieee80211/dot11d.c.

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Remove unnecessary return statement in ieee80211_crypt_tkip.c
Rashika Kheria [Sat, 2 Nov 2013 17:33:43 +0000 (23:03 +0530)]
Staging: rtl8187se: Remove unnecessary return statement in ieee80211_crypt_tkip.c

This patch removes an unnecessary return statement in the function
ieee80211_tkip_null() in ieee80211/ieee80211_crypt_tkip.c.

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Fix code indent should use tabs in ieee80211_crypt_tkip.c
Rashika Kheria [Sat, 2 Nov 2013 17:28:20 +0000 (22:58 +0530)]
Staging: rtl8187se: Fix code indent should use tabs in ieee80211_crypt_tkip.c

This patch fixes the following checkpatch.pl issues in
ieee80211/ieee80211_crypt_tkip.c-
ERROR: code indent should use tabs where possible

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Replace "foo * bar" with "foo *bar" in ieee80211_crypt_tkip.c
Rashika Kheria [Sat, 2 Nov 2013 17:27:07 +0000 (22:57 +0530)]
Staging: rtl8187se: Replace "foo * bar" with "foo *bar" in ieee80211_crypt_tkip.c

This patch fixes the following checkpatch.pl issues in
ieee80211/ieee80211_crypt_tkip.c-
ERROR: "foo * bar" should be "foo *bar"

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Remove useless comments in ieee80211_crypt_tkip.c
Rashika Kheria [Sat, 2 Nov 2013 17:25:52 +0000 (22:55 +0530)]
Staging: rtl8187se: Remove useless comments in ieee80211_crypt_tkip.c

This patch removes useless comments in ieee80211/ieee80211_crypt_tkip.c.
And, hence also removes the following checkpatch.pl issue-
ERROR: do not use C99 // comments

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Fix quoted strings split across lines in ieee80211_crypt_ccmp.c
Rashika Kheria [Sat, 2 Nov 2013 17:24:39 +0000 (22:54 +0530)]
Staging: rtl8187se: Fix quoted strings split across lines in ieee80211_crypt_ccmp.c

This patch fixes the following checkpatch.pl issues in
ieee80211/ieee80211_crypt_ccmp.c-
WARNING: quoted string split across lines

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Remove unnecessary comments in ieee80211_crypt_ccmp.c
Rashika Kheria [Sat, 2 Nov 2013 17:23:07 +0000 (22:53 +0530)]
Staging: rtl8187se: Remove unnecessary comments in ieee80211_crypt_ccmp.c

This patch removes unnecessary comments written in ieee80211/ieee80211_crypt_ccmp.c.
And hence also, removes the following checkpatch.pl issue-
ERROR: do not use C99 // comments

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Fix line over 80 characters in dot11d.c
Rashika Kheria [Sat, 2 Nov 2013 17:21:26 +0000 (22:51 +0530)]
Staging: rtl8187se: Fix line over 80 characters in dot11d.c

This patch fixes the following checkpatch.pl issues in
ieee80211/dot11d.c-
WARNING: line over 80 characters

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Remove unnecessary braces around single statement in dot11d.c
Rashika Kheria [Sat, 2 Nov 2013 17:19:59 +0000 (22:49 +0530)]
Staging: rtl8187se: Remove unnecessary braces around single statement in dot11d.c

This patch fixes the following checkpatch.pl issues in
ieee80211/dot11d.c-
WARNING: braces {} are not necessary for single statement blocks

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Fix space prohibited before semicolon in dot11d.c
Rashika Kheria [Sat, 2 Nov 2013 17:17:45 +0000 (22:47 +0530)]
Staging: rtl8187se: Fix space prohibited before semicolon in dot11d.c

This patch fixes the following checkpatch.pl issues in
ieee80211/dot11d.c-
WARNING: space prohibited before semicolon

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Fix printk() should include KERN_ facility level
Rashika Kheria [Sat, 2 Nov 2013 17:16:00 +0000 (22:46 +0530)]
Staging: rtl8187se: Fix printk() should include KERN_ facility level

This patch fixes the following checkpatch.pl issues in
ieee80211/dot11d.c-
WARNING: printk() should include KERN_ facility level

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: Fix C99 style commenting in dot11d.c
Rashika Kheria [Sat, 2 Nov 2013 17:14:38 +0000 (22:44 +0530)]
Staging: rtl8187se: Fix C99 style commenting in dot11d.c

This patch fixes the following checkpatch.pl issues in
ieee80211/dot11d.c-
ERROR: do not use C99 // comments

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agodrivers : staging :rtl8187se : r8180_core.c : remove space before semicolon
Himangi Saraogi [Thu, 31 Oct 2013 03:31:41 +0000 (09:01 +0530)]
drivers : staging :rtl8187se : r8180_core.c : remove space before semicolon

This patch removes the checkpatch.pl warning space prohibited before
semicolon.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: imx-drm: remove unnecessary braces
Sima Baymani [Sun, 3 Nov 2013 10:18:57 +0000 (11:18 +0100)]
staging: imx-drm: remove unnecessary braces

Fix checkpatch warning by removing unnecessary braces.
Compile-tested the single file.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Archana Kumari <archanakumari959@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: imx-drm: Fix warning for static const char * array in imx-ldb.c
Archana kumari [Wed, 30 Oct 2013 19:04:08 +0000 (00:34 +0530)]
staging: imx-drm: Fix warning for static const char * array in imx-ldb.c

This patch fixes the warning "static const char * array should
probably be static const char * const" in imx-ldb.c.

Signed-off-by: Archana kumari <archanakumari959@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: cxt1e1: fix long lines warning
Sima Baymani [Tue, 5 Nov 2013 20:28:56 +0000 (21:28 +0100)]
staging: cxt1e1: fix long lines warning

Break up long lines per checkpatch warnings.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: cxt1e1: remove typedef comet_t
Sima Baymani [Tue, 5 Nov 2013 20:49:16 +0000 (21:49 +0100)]
staging: cxt1e1: remove typedef comet_t

Remove typedef declaration per checkpatch warning.
Built and loaded.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: cxt1e1: comet,h - fix placement of braces
Sima Baymani [Tue, 5 Nov 2013 20:22:56 +0000 (21:22 +0100)]
staging: cxt1e1: comet,h - fix placement of braces

Fix bad placement of braces per checkpatch warning.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: cxt1e1: comet.h - fix long lines warning
Sima Baymani [Tue, 5 Nov 2013 20:22:12 +0000 (21:22 +0100)]
staging: cxt1e1: comet.h - fix long lines warning

Fix long lines warnings from checkpatch which were introduced in
previous patch in series due to reindentation.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: cxt1e1: comet.h - fix wrong indentation
Sima Baymani [Tue, 5 Nov 2013 20:21:38 +0000 (21:21 +0100)]
staging: cxt1e1: comet.h - fix wrong indentation

Reindent needed parts of comet.h per checkpatch warnings - whitespace
changes only.

This patch introduces long line warnings because of the reindentation.
Those warnings are fixed by the next patch in series.

Signed-off-by: Sima Baymani <sima.baymani@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging/cxt1e1:Fixes incorrect brace placement
Dulshani Gunawardhana [Wed, 30 Oct 2013 18:49:54 +0000 (00:19 +0530)]
staging/cxt1e1:Fixes incorrect brace placement

This patch fixes the error "This open brace { should be on the
above line" detected via checkpatch.pl.

Signed-off-by: Dulshani Gunawardhana <dulshani.gunawardhana89@gmail.com>
Reviewed-by: Zach Brown <zab@redhat.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: fix remaining checkpatch issues in ft1000_hw.c
Kelley Nielsen [Wed, 6 Nov 2013 13:10:19 +0000 (05:10 -0800)]
staging: ft1000: fix remaining checkpatch issues in ft1000_hw.c

The file ft1000_hw.c is still full of coding style problems that make it
challenging to read and understand. The lines inside the switch cases
in ft1000_proc_drvmsg() are indented too deeply, so remove one leading
tab. Join lines that are now able to fit in the 80 character limit.
This will take care of the "too many leading tabs" issue. Run
checkpatch.pl on the file, and correct all other issues it reports
(except lines with user visible strings over 80 chars).

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Suggested-by: Waskiewicz Jr, Peter P <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: flatten nesting in dsp_broadcast_msg_id()
Kelley Nielsen [Wed, 6 Nov 2013 13:09:56 +0000 (05:09 -0800)]
staging: ft1000: flatten nesting in dsp_broadcast_msg_id()

The function dsp_broadcast_msg_id() has four levels of nesting. Move the
handling for failed allocation for *dpram_blk from the else block at the
end to the block immediately following the test, reverse the sense of the
test, and exit with an error code if the allocation fails. This eliminates
descending into an if block if the allocation is successful. Move all
lines inside the removed block one tab to the left, and join lines
that will fall under the 80 char limit.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: fix checkpatch issues in ft1000_poll()
Kelley Nielsen [Wed, 6 Nov 2013 13:09:30 +0000 (05:09 -0800)]
staging: ft1000: fix checkpatch issues in ft1000_poll()

The function ft1000_poll(), in ft1000_hw.c, has many miscellaneous
coding style issues, such as improper indentation, C99 comments, use of
msleep(), and lines over 80 characters. Changes all spaces at the start
of lines to the proper number of tabs. Convert C99 comments to standard
/* */ style. Change calls to msleep(10) to usleep_range(9000, 11000).
Break lines over 80 characters, unless they are user visible strings.
Remove space before open paren in function calls. Fix any other issues
that checkpatch finds.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: flatten nesting in handle_misc_portid
Kelley Nielsen [Wed, 6 Nov 2013 13:08:58 +0000 (05:08 -0800)]
staging: ft1000: flatten nesting in handle_misc_portid

The newly extracted function handle_misc_portid still has several
unnecessary levels of nesting, having inherited its logic from the
original extracted lines. Move handling for failed memory allocation
(of *pdpram_blk) to the top of the function, and return -1 from within
it. This eliminates the if statement around the body of the function.
Change two levels of nested if/else to an if/else-if/else. Create a
label, exit_failure, at the end of the function with the cleanup code,
and goto it at all points of failure. Also, goto it if the call to
ft1000_receive_cmd() fails, instead of descending into an if block if
it succeeds. Pull all lines from inside the former if blocks to the
left, and rejoin lines to take advantage of reclaimed horizontal space.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: extract helper handle_misc_portid()
Kelley Nielsen [Wed, 6 Nov 2013 13:08:11 +0000 (05:08 -0800)]
staging: ft1000: extract helper handle_misc_portid()

The function ft1000_poll, in ft1000_hw.c, is complex, with deep levels
of nesting, unnecessary variables, and style issues. Extract the default
case of the switch statement to its own function, handle_misc_portid.
Make the variable struct dpram_blk *pdpram_blk local to the new function
and remove it from the old. The variable struct pseudo_hdr *ppseudo_hdr is
used only once, to access a member of another struct, so eliminate it
and access the member directly. Return -1 in all the places where the
code fails, and 0 on successful completion. Fix coding style errors.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: extract dsp_broadcast_msg_id()
Kelley Nielsen [Wed, 6 Nov 2013 05:39:10 +0000 (21:39 -0800)]
staging: ft1000: extract dsp_broadcast_msg_id()

The function ft1000_poll, in ft1000_hw.c, is overly complex, with at
least five levels of nesting. Extract the lines in switch case
DSPBCMSGID into their own function, called dsp_broadcast_msg_id(). Pass
one parameter, struct ft1000_usb *dev. Make a copy of struct dpram_blk
*pdpram_blk local to the new function, since it is initialized at the
top of each case in which it appears. Make unsigned long flags local to
the new function. Remove the assignment to struct pseudo_hdr
*ppseudo_hdr, which is otherwise unused in the switch case, and receives
the same assignment at the top of each case in which it appears. Return
an int, 0 for success and -1 for error. Correct style issues in the
extracted lines.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: remove unused variable nxtph
Kelley Nielsen [Wed, 6 Nov 2013 05:36:55 +0000 (21:36 -0800)]
staging: ft1000: remove unused variable nxtph

The function ft1000_poll, in ft1000_hw.c, is overly complex, with at
least five different levels of nesting. While preparing to extract one
of the cases to its own function, I discovered that the variable nxtph
is not used. It is declared and assigned a value in ft1000_poll(), then
passed by reference to the helper function ft1000_receive_command(),
which receives it as parameter. pnxtph does not appear in the body of
this function. Remove all occurrences of nxtph and pnxtph.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: STATUS defines completely removed
Kelley Nielsen [Thu, 31 Oct 2013 01:05:16 +0000 (18:05 -0700)]
staging: ft1000: STATUS defines completely removed

The ft1000 driver ignores the normal Linux error codes, using its
own macros, STATUS, STATUS_SUCCESS, and STATUS_FAILURE, instead.
Unsigned variables (u16 and u32) are sometimes used to hold them.
This patch converts all occurences of these macros to 0, 0 and -1,
respectively. It also changes the last remaining status variables
(mostly called status and ret) to ints, and removes the declarations
of the macros. This patch does not correct the whitespace issues
in the lines where the changes were made.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: remove formal function headers from ft1000_hw.c
Kelley Nielsen [Thu, 31 Oct 2013 01:04:41 +0000 (18:04 -0700)]
staging: ft1000: remove formal function headers from ft1000_hw.c

The file ft1000_hw.c contains formal C99 style function headers that
waste space and convey little to no useful information. This patch
converts the headers to either one line standard /* */ style comments
or shorter standard style headers with parameter lists (if the parameter
list seemed helpful), or eliminates them entirely. Besides needing to be
made of its own accord, this change is in preparation to eliminate the
nonstandard STATUS_* #defines from the driver since they were cited in most
of the headers.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: STATUS_ defines removed from ft1000_download.c
Kelley Nielsen [Wed, 30 Oct 2013 18:48:34 +0000 (11:48 -0700)]
staging: ft1000: STATUS_ defines removed from ft1000_download.c

Two files in the ft1000 usb driver ignore expected Linux error codes,
and instead use two STATUS_SUCCESS 0, and STATUS_FAILURE
0x1001. This patch removes all remaining occurrences of these from the
file ft1000_download.c. All occurrences of STATUS_SUCCESS have been
replaced by 0, and occurrences of STATUS_FAILURE have been replaced by
-1. One occurence of STATUS_FAILURE has been completely removed:
get_handshake collects either a local #define or 0 from its helper
function, check_usb_db, and immediately sets the collecting variable to
STATUS_FAILURE if the #define is returned. check_usb_db has been
modified to return -1 instead of the #define.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: drm/imx: fix return value check in ipu_add_subdevice_pdata()
Wei Yongjun [Wed, 30 Oct 2013 03:15:51 +0000 (11:15 +0800)]
staging: drm/imx: fix return value check in ipu_add_subdevice_pdata()

In case of error, the function platform_device_register_data() returns
ERR_PTR() and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: zram: Fix access of NULL pointer
Rashika Kheria [Wed, 30 Oct 2013 13:06:32 +0000 (18:36 +0530)]
Staging: zram: Fix access of NULL pointer

This patch fixes the bug in reset_store caused by accessing NULL pointer.

The bdev gets its value from bdget_disk() which could fail when memory
pressure is severe and hence can return NULL because allocation of
inode in bdget could fail.

Hence, this patch introduces a check for bdev to prevent reference to a
NULL pointer in the later part of the code. It also removes unnecessary
check of bdev for fsync_bdev().

Cc: stable <stable@vger.kernel.org>
Acked-by: Jerome Marchand <jmarchan@redhat.com>
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: zram: Fix variable dereferenced before check
Rashika Kheria [Wed, 30 Oct 2013 13:13:32 +0000 (18:43 +0530)]
Staging: zram: Fix variable dereferenced before check

This patch fixes the following Smatch warning in zram_drv.c-
drivers/staging/zram/zram_drv.c:899
destroy_device() warn: variable dereferenced before check 'zram->disk' (see line 896)

Acked-by: Minchan Kim <minchan@kernel.org>
Acked-by: Jerome Marchand <jmarchan@redhat.com>
Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: space prohibited before semicolon in r8185b_init.c
Ebru Akagunduz [Tue, 29 Oct 2013 21:05:25 +0000 (23:05 +0200)]
Staging: rtl8187se: space prohibited before semicolon in r8185b_init.c

Fix checkpatch.pl issues with space prohibited
before semicolon in r8185b_init.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: fix space prohibited after that open parenthesis '(' in r8185b_init.c
Ebru Akagunduz [Tue, 29 Oct 2013 21:05:24 +0000 (23:05 +0200)]
Staging: rtl8187se: fix space prohibited after that open parenthesis '(' in r8185b_init.c

Fix checkpatch.pl issues with space prohibited after that
open parenthesis '(' in r8185b_init.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: fix braces {} are not necessary for single statement blocks in...
Ebru Akagunduz [Tue, 29 Oct 2013 21:05:23 +0000 (23:05 +0200)]
Staging: rtl8187se: fix braces {} are not necessary for single statement blocks in r8185b_init.c

Fix checkpatch.pl issues with braces {} are not necessary
for single statement blocks in r8185b_init.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: fix trailing whitespace in r8185b_init.c
Ebru Akagunduz [Tue, 29 Oct 2013 21:05:21 +0000 (23:05 +0200)]
Staging: rtl8187se: fix trailing whitespace in r8185b_init.c

Fix checkpatch.pl issues with trailing whitespace
in r8185b_init.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: rtl8187se: fix please, no space before tabs in r8185b_init.c
Ebru Akagunduz [Tue, 29 Oct 2013 21:05:20 +0000 (23:05 +0200)]
Staging: rtl8187se: fix please, no space before tabs in r8185b_init.c

Fix checkpatch.pl issues with please, no space before
tabs in r8185b_init.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agodrivers/staging/nvec/Kconfig: remove trailing whitespace
Himangi Saraogi [Wed, 30 Oct 2013 01:00:49 +0000 (06:30 +0530)]
drivers/staging/nvec/Kconfig: remove trailing whitespace

This patch fixes checkpatch.pl error trailing whitespace.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Reviewed-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: dwc2: Fix variable dereferenced before check
Rashika Kheria [Tue, 29 Oct 2013 22:46:55 +0000 (04:16 +0530)]
Staging: dwc2: Fix variable dereferenced before check

This patch fixes the following smatch warning in hcd_intr.c-
drivers/staging/dwc2/hcd_intr.c:1946 dwc2_hc_n_intr() warn: variable dereferenced before check 'chan' (see line 1936)

Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoStaging: xgifb: fix braces {} are not necessary for any arm of this statement
Ebru Akagunduz [Tue, 29 Oct 2013 20:50:54 +0000 (22:50 +0200)]
Staging: xgifb: fix braces {} are not necessary for any arm of this statement

Fix checkpatch.pl issues with braces {} are not necessary
for any arm of this statement in vb_setmode.c

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: rtl8192e: remove unneeded semicolons
Valentina Manea [Tue, 29 Oct 2013 19:06:52 +0000 (21:06 +0200)]
staging: rtl8192e: remove unneeded semicolons

This fixes coccinelle errors regarding unneeded
semicolons.

Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: rtl8192e: use true and false for bool variables
Valentina Manea [Tue, 29 Oct 2013 18:58:48 +0000 (20:58 +0200)]
staging: rtl8192e: use true and false for bool variables

This patch fixes coccinelle errors for bool variables
initialized with 1 or 0 instead of true and false.

Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: return values corrected in scram_start_dwnld
Kelley Nielsen [Tue, 29 Oct 2013 23:06:36 +0000 (16:06 -0700)]
staging: ft1000: return values corrected in scram_start_dwnld

The ft1000 usb driver ignores expected Linux error codes, and uses two
values defined in ft1000_usb.h: STATUS_SUCCESS 0, and STATUS_FAILURE
0x1001; and sometimes -1. This patch changes the return values of the
function scram_start_dwnld to match the status of the handshake returned
by its helper functions, get_handshake and get_handshake_usb. If the
handshake fails, -ENETRESET is returned instead of the inappropriate
STATUS_FAILURE. Also, a new test has been added to differentiate failure
due to timeout from failure due to net reset (the default). -ETIMEDOUT
is returned in this case. Finally, 0 is returned on success instead of
STATUS_SUCCESS.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: ft1000: change values of status return variable in write_dpram32_and_check
Kelley Nielsen [Tue, 29 Oct 2013 21:54:31 +0000 (14:54 -0700)]
staging: ft1000: change values of status return variable in write_dpram32_and_check

The ft1000 usb driver ignores expected Linux error codes, and uses two
values defined in ft1000_usb.h: STATUS_SUCCESS 0, and STATUS_FAILURE
0x1001; and sometimes -1. This patch changes the return value of the
function write_dpram_32_and check to 0 or -EREMOTEIO, respectively. The
relevant change was made in the helper function check_buffers (which is
only called from write_dpram32_and_check); it now returns 0 on success
and -EREMOTEIO on failure, and this is allowed to propagate through
write_dpram32_and_check. Assignments to the return variable status that
are no longer needed were removed as well. In one function up the call
chain, dsp_reload in ft1000_hw.c, the status variable was changed from
u16 to int to avoid collecting a signed value in an unsigned variable.

Signed-off-by: Kelley Nielsen <kelleynnn@gmail.com>
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: bcm: Remove unnecessary pointer casting
Lisa Nguyen [Tue, 29 Oct 2013 21:19:50 +0000 (14:19 -0700)]
staging: bcm: Remove unnecessary pointer casting

Some void pointers can be assigned to other
pointer variables in functions without casting.

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agoimx-drm: ipuv3-crtc: Invert IPU DI0 clock polarity
Fabio Estevam [Tue, 29 Oct 2013 21:42:22 +0000 (19:42 -0200)]
imx-drm: ipuv3-crtc: Invert IPU DI0 clock polarity

sig_cfg.clk_pol controls the 'di0_polarity_disp_clk' bit of register
IPUx_DI0_GENERAL through the following code in imx-drm/ipu-v3/ipu-di.c:

if (!sig->clk_pol)
di_gen |= DI_GEN_POLARITY_DISP_CLK;

With 'di0_polarity_disp_clk' bit set we do not have stable HDMI output on
mx6solo: contours of pictures look jittery and the white colour does not appear
really white.

Russell King initially reported this problem at:
http://www.spinics.net/lists/arm-kernel/msg279805.html

Inverting 'di0_polarity_disp_clk' leads to stable HDMI output image.

Tested on the following boards:
- mx6solowandboard (HDMI output)
- mx6qwandboard (HDMI output)
- mx6qsabrelite (LVDS)
- mx6qsabresd (HDMI output and LVDS)
- mx6dlsabresd (HDMI output)
- mx53qsb (parallel WVGA display)

Reported-by: Russell King <rmk+kernel@arm.linux.org.uk>
Suggested-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: r8188eu: Fix sparse warnings in rtl_p2p.c
Larry Finger [Thu, 24 Oct 2013 03:31:37 +0000 (22:31 -0500)]
staging: r8188eu: Fix sparse warnings in rtl_p2p.c

Sparse displays the following:

  CHECK   drivers/staging/rtl8188eu/core/rtw_p2p.c
drivers/staging/rtl8188eu/core/rtw_p2p.c:162:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_p2p.c:162:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_p2p.c:162:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_p2p.c:221:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_p2p.c:221:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_p2p.c:221:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_p2p.c:292:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_p2p.c:292:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_p2p.c:292:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_p2p.c:371:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_p2p.c:371:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_p2p.c:371:15:    got restricted __le16 *<noident>

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: r8188eu: Fix sparse warnings in rtw_mlme_ext.c
Larry Finger [Thu, 24 Oct 2013 03:31:36 +0000 (22:31 -0500)]
staging: r8188eu: Fix sparse warnings in rtw_mlme_ext.c

Sparse displays the following:

  CHECK   drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:1874:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:1874:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:1874:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2221:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2221:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2221:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2583:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2583:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2583:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2750:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2750:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:2750:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3002:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3002:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3002:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3197:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3197:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3197:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3311:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3311:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3311:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3563:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3563:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:3563:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4522:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4522:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4522:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4750:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4750:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4750:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4906:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4906:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:4906:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5040:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5040:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5040:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5184:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5184:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5184:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5322:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5322:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5322:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5654:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5654:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5654:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5769:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5769:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5769:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5894:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5894:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5894:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5996:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5996:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:5996:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6066:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6066:15:    expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6066:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6200:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6200:15:    expected unsigned short *fctrl
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c:6200:15:    got restricted __le16 *<noident>

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: r8188eu: Fix sparse warnings in rtl8188e.cmd.c
Larry Finger [Thu, 24 Oct 2013 03:31:35 +0000 (22:31 -0500)]
staging: r8188eu: Fix sparse warnings in rtl8188e.cmd.c

Sparse displays the following:

  CHECK   drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:285:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:285:15:    expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:285:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:368:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:368:15:    expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:368:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:403:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:403:15:    expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:403:15:    got restricted __le16 *<noident>
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:465:15: warning: incorrect type in assignment (different base types)
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:465:15:    expected unsigned short [usertype] *fctrl
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c:465:15:    got restricted __le16 *<noident>

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: r8188eu: Fix sparse warnings in rtw_ieee80211.c
Larry Finger [Thu, 24 Oct 2013 03:31:34 +0000 (22:31 -0500)]
staging: r8188eu: Fix sparse warnings in rtw_ieee80211.c

Sparse reports the following:

  CHECK   drivers/staging/rtl8188eu/core/rtw_ieee80211.c
drivers/staging/rtl8188eu/core/rtw_ieee80211.c:1593:14: warning: cast to restricted __le16

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: s626: replace S626_MULT_X? values
Ian Abbott [Mon, 21 Oct 2013 09:10:39 +0000 (10:10 +0100)]
staging: comedi: s626: replace S626_MULT_X? values

Replace the use of the `S626_MULT_X1`, `S626_MULT_X2` and `S626_MULT_X4`
clock multiplier values with the equivalent `S626_CLKMULT_1X`,
`S626_CLKMULT_2X` and `S626_CLKMULT_4X` values to avoid duplication.
Replace the use of `S626_MULT_X0` with a new macro
`S626_CLKMULT_SPECIAL` (this is treated specially by the
'ClkMultA'/'ClkMultB' field of the 'CRA'/'CRB' register).  Remove the
now unused `S626_MULT_X?` macros.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: s626: remove S626_BF_* macros
Ian Abbott [Mon, 21 Oct 2013 09:10:38 +0000 (10:10 +0100)]
staging: comedi: s626: remove S626_BF_* macros

The `S626_BF_*` bitfield position macros are no longer used and are just
a subset of the corresponding `S626_STDBIT_*` bitfield position macros.
Remove them.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: s626: expand standardized IndxSrc values
Ian Abbott [Mon, 21 Oct 2013 09:10:37 +0000 (10:10 +0100)]
staging: comedi: s626: expand standardized IndxSrc values

The 'IndxSrc' value for the standardized encoder setup is currently 1
bit wide and takes one of the following values:

  S626_INDXSRC_HARD = 0 // index source from hardware encoder
  S626_INDXSRC_SOFT = 1 // index source software controlled by IndxPol

However the hardware 'IndxSrcA' and 'IndxSrcB' values for the 'A' and
'B' counters are 2 bits wide.  The above standardized values 0 and 1
correspond to the hardware values 0 and 2.

In order to simplify conversions between the standardized values and
hardware values, expand the range of standardized values to cover all
four possible values.  The new values are as follows:

  S626_INDXSRC_ENCODER = 0  // index source from hardware encoder
  S626_INDXSRC_DIGIN = 1    // index source from digital inputs
  S626_INDXSRC_SOFT = 2     // index source s/w controlled by IndxPol
  S626_INDXSRC_DISABLED = 2 // index source disabled

(Note the change in value for `S626_INDXSRC_SOFT` and the replacement of
`S626_INDXSRC_HARD` with `S626_INDXSRC_ENCODER` for consistency with the
`CntSrc` values.)

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: comedi: s626: make CRA and CRB setup conversions more readable
Ian Abbott [Mon, 21 Oct 2013 09:10:36 +0000 (10:10 +0100)]
staging: comedi: s626: make CRA and CRB setup conversions more readable

Use the new macros defined in "s626.h" for constructing and decomposing
'CRA', 'CRB' and standardized encoder setup values to make the
conversions between standardized encoder setup values, and CRA/CRB
register values easier to follow.

There is some messing about with the 'IndxSrc' values which are 1-bit
wide in the standardized encoder setup, and 2-bit wide in the 'CRA' and
'CRB' register values.  This will be addressed by a later patch.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
11 years agostaging: drm/imx: fix return value check in imx_drm_init()
Wei Yongjun [Fri, 25 Oct 2013 09:07:18 +0000 (17:07 +0800)]
staging: drm/imx: fix return value check in imx_drm_init()

In case of error, the function platform_device_register_simple() returns
ERR_PTR() and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>