linux-stable.git/drivers/staging/ft1000, branch linux-3.9.y Linux kernel stable tree Merge tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2013-02-21T20:11:44+00:00 Linus Torvalds torvalds@linux-foundation.org 2013-02-21T20:11:44+00:00 b5c78e04dd061b776978dad61dd85357081147b0 Pull staging tree update from Greg Kroah-Hartman: "Here's the big staging tree merge for 3.9-rc1 Lots of cleanups and updates for drivers all through the staging tree. We are pretty much "code neutral" here, adding just about as many lines as we removed. All of these have been in linux-next for a while." * tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (804 commits) staging: comedi: vmk80xx: wait for URBs to complete staging: comedi: drivers: addi-data: hwdrv_apci3200.c: Add a missing semicolon staging: et131x: Update TODO list staging: et131x: Remove assignment of skb->dev staging: wlan-ng: hfa384x.h: fix for error reported by smatch staging/zache checkpatch ERROR: spaces prohibited around that staging/ozwpan: Mark read only parameters and structs as const staging/ozwpan: Remove empty and unused function oz_cdev_heartbeat staging/ozwpan: Mark local functions as static (fix sparse warnings) staging/ozwpan: Add missing header includes staging/usbip: Mark local functions as static (fix sparse warnings) staging/xgifb: Remove duplicated code in loops. staging/xgifb: Consolidate return paths staging/xgifb: Remove code without effect staging/xgifb: Remove unnecessary casts staging/xgifb: Consolidate if/else if with identical code branches staging: vt6656: replaced custom TRUE definition with true staging: vt6656: replaced custom FALSE definition with false staging: vt6656: replace custom BOOL definition with bool staging/rtl8187se: Mark functions as static to silence sparse ... 
Pull staging tree update from Greg Kroah-Hartman:
 "Here's the big staging tree merge for 3.9-rc1

  Lots of cleanups and updates for drivers all through the staging tree.
  We are pretty much "code neutral" here, adding just about as many
  lines as we removed.

  All of these have been in linux-next for a while."

* tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (804 commits)
  staging: comedi: vmk80xx: wait for URBs to complete
  staging: comedi: drivers: addi-data: hwdrv_apci3200.c: Add a missing semicolon
  staging: et131x: Update TODO list
  staging: et131x: Remove assignment of skb->dev
  staging: wlan-ng: hfa384x.h: fix for error reported by smatch
  staging/zache checkpatch ERROR: spaces prohibited around that
  staging/ozwpan: Mark read only parameters and structs as const
  staging/ozwpan: Remove empty and unused function oz_cdev_heartbeat
  staging/ozwpan: Mark local functions as static (fix sparse warnings)
  staging/ozwpan: Add missing header includes
  staging/usbip: Mark local functions as static (fix sparse warnings)
  staging/xgifb: Remove duplicated code in loops.
  staging/xgifb: Consolidate return paths
  staging/xgifb: Remove code without effect
  staging/xgifb: Remove unnecessary casts
  staging/xgifb: Consolidate if/else if with identical code branches
  staging: vt6656: replaced custom TRUE definition with true
  staging: vt6656: replaced custom FALSE definition with false
  staging: vt6656: replace custom BOOL definition with bool
  staging/rtl8187se: Mark functions as static to silence sparse
  ...
staging: Remove unnecessary OOM messages 2013-02-11T18:10:33+00:00 Joe Perches joe@perches.com 2013-02-11T17:41:29+00:00 78110bb8dc4a7ff331bfa3cfe7d4e287cfb3f22b alloc failures already get standardized OOM messages and a dump_stack. For the affected mallocs around these OOM messages: Converted kzallocs with multiplies to kcalloc. Converted kmallocs with multiplies to kmalloc_array. Converted a kmalloc/strlen/strncpy to kstrdup. Moved a spin_lock below a removed OOM message and removed a now unnecessary spin_unlock. Neatened alignment and whitespace. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
alloc failures already get standardized OOM
messages and a dump_stack.

For the affected mallocs around these OOM messages:

Converted kzallocs with multiplies to kcalloc.
Converted kmallocs with multiplies to kmalloc_array.
Converted a kmalloc/strlen/strncpy to kstrdup.
Moved a spin_lock below a removed OOM message and
removed a now unnecessary spin_unlock.
Neatened alignment and whitespace.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Staging: ft1000-usb: Fix call to obsolete function 2013-01-07T20:33:45+00:00 Kurt Kanzenbach shifty91@gmail.com 2012-12-05T19:03:35+00:00 a11b0e860bff66d20d7d88211df58620619a0fcd strict_strtoul is obsolete and should be replaced with kstrto* function as reported by checkpatch.pl. pInfo->CardNumber is a u8. This is why kstrtou8 should be used here. Signed-off-by: Kurt Kanzenbach <shifty91@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
strict_strtoul is obsolete and should be replaced with
kstrto* function as reported by checkpatch.pl.
pInfo->CardNumber is a u8. This is why kstrtou8 should be
used here.

Signed-off-by: Kurt Kanzenbach <shifty91@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: ft1000: rename struct ft1000_device to ft1000_usb 2013-01-07T20:33:45+00:00 Ondrej Zary linux@rainbow-software.org 2012-12-02T17:51:40+00:00 dedbc93318b89c0386670a5c3e1de621311a40b0 After unifying struct ft1000_info, struct ft1000_device is now wrong name. Rename it to ft1000_usb to match its semantics. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Reviewed-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
After unifying struct ft1000_info, struct ft1000_device is now wrong name.
Rename it to ft1000_usb to match its semantics.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Reviewed-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: ft1000: unify struct ft1000_info between USB and PCMCIA drivers 2013-01-07T20:33:45+00:00 Ondrej Zary linux@rainbow-software.org 2012-12-02T11:30:19+00:00 3aa2303a20e3aac5a8445777b665a433d60c2786 Unify struct ft1000_info between ft1000-usb and ft1000-pcmcia and move it to common ft1000.h. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Tested-by: Marek Belisko <marek.belisko@open-nandra.com> Review-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Unify struct ft1000_info between ft1000-usb and ft1000-pcmcia and move it to
common ft1000.h.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Tested-by: Marek Belisko <marek.belisko@open-nandra.com>
Review-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
ethtool: fix drvinfo strings set in drivers 2013-01-07T05:06:31+00:00 Jiri Pirko jiri@resnulli.us 2013-01-06T00:44:26+00:00 7826d43f2db45c9305a6e0ba165650e1a203f517 Use strlcpy where possible to ensure the string is \0 terminated. Use always sizeof(string) instead of 32, ETHTOOL_BUSINFO_LEN and custom defines. Use snprintf instead of sprint. Remove unnecessary inits of ->fw_version Remove unnecessary inits of drvinfo struct. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Signed-off-by: David S. Miller <davem@davemloft.net> 
Use strlcpy where possible to ensure the string is \0 terminated.
Use always sizeof(string) instead of 32, ETHTOOL_BUSINFO_LEN
and custom defines.
Use snprintf instead of sprint.
Remove unnecessary inits of ->fw_version
Remove unnecessary inits of drvinfo struct.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
staging: ft1000: remove assigments of ret and initialise it in beginning 2012-11-27T00:21:18+00:00 Devendra Naga devendra.aaru@gmail.com 2012-11-24T10:01:06+00:00 f884c19224dc190d47251031814857c652d8a563 as ret is every time assigned to EINVAL in fail cases, initialise it at the beginning. Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
as ret is every time assigned to EINVAL in fail cases, initialise it at
the beginning.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: ft1000: replace c99 comments with c88 2012-09-17T12:31:32+00:00 Devendra Naga devendra.aaru@gmail.com 2012-09-16T17:49:40+00:00 ad139634c50999ab4007a2d83afe96cc500b0afd replace some of the c99 comments to the structures with c88 comment style no code change is done here. Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
replace some of the c99 comments to the structures with c88 comment style
no code change is done here.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: ft1000: Replace timeout values with USB_CTRL_G(S)ET_TIMEOUT. 2012-08-14T02:28:58+00:00 Marek Belisko marek.belisko@open-nandra.com 2012-07-30T21:07:17+00:00 b0add95059a87baa855633412075475e100575ca Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
staging: ft1000: Fix ft1000_control function timeout argument usage. 2012-08-14T02:28:58+00:00 Marek Belisko marek.belisko@open-nandra.com 2012-07-30T21:07:16+00:00 18978952c1815c0d6c25f0d8849c67204074b3e2 Function ft1000_control have input argument timeout which was not passed to usb_control_msg instead hardcoded to LARGE_TIMEOUT. Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
Function ft1000_control have input argument timeout which was not passed
to usb_control_msg instead hardcoded to LARGE_TIMEOUT.

Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>