aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge tag 'staging-3.17-rc1' of ↵Linus Torvalds2014-08-04
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging driver updates from Greg KH: "Here's the big pull request for the staging driver tree for 3.17-rc1. Lots of things in here, over 2000 patches, but the best part is this: 1480 files changed, 39070 insertions(+), 254659 deletions(-) Thanks to the great work of Kristina Martšenko, 14 different staging drivers have been removed from the tree as they were obsolete and no one was willing to work on cleaning them up. Other than the driver removals, loads of cleanups are in here (comedi, lustre, etc.) as well as the usual IIO driver updates and additions. All of this has been in the linux-next tree for a while" * tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (2199 commits) staging: comedi: addi_apci_1564: remove diagnostic interrupt support code staging: comedi: addi_apci_1564: add subdevice to check diagnostic status staging: wlan-ng: coding style problem fix staging: wlan-ng: fixing coding style problems staging: comedi: ii_pci20kc: request and ioremap memory staging: lustre: bitwise vs logical typo staging: dgnc: Remove unneeded dgnc_trace.c and dgnc_trace.h staging: dgnc: rephrase comment staging: comedi: ni_tio: remove some dead code staging: rtl8723au: Fix static symbol sparse warning staging: rtl8723au: usb_dvobj_init(): Remove unused variable 'pdev_desc' staging: rtl8723au: Do not duplicate kernel provided USB macros staging: rtl8723au: Remove never set struct pwrctrl_priv.bHWPowerdown staging: rtl8723au: Remove two never set variables staging: rtl8723au: RSSI_test is never set staging:r8190: coding style: Fixed checkpatch reported Error staging:r8180: coding style: Fixed too long lines staging:r8180: coding style: Fixed commenting style staging: lustre: ptlrpc: lproc_ptlrpc.c - fix dereferenceing user space buffer staging: lustre: ldlm: ldlm_resource.c - fix dereferenceing user space buffer ...
| * staging: comedi: addi_apci_1564: remove diagnostic interrupt support codeChase Southwood2014-08-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As per Ian, at this point in time it is not worth implementing an async command interface for diagnostic interrupts for this board. As this is the case, this patch removes the code which supports such interrupts as it is now unused. This includes removing apci1564_do_read(), which was the insn_read operation for the digital output subdevice, since all it was doing was reading the current diagnostic interrupt type and returning it in 'data'. This doesn't follow the comedi API and this operation can be emulated by the comedi core anyway since the insn_bits operation follows the comedi API. So it is safe to simply remove this function. Signed-off-by: Chase Southwood <chase.southwood@gmail.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: comedi: addi_apci_1564: add subdevice to check diagnostic statusChase Southwood2014-08-01
| | | | | | | | | | | | | | | | | | | | | | | | | | This board provides VCC/CC diagnostic information, and it also supports diagnostic interrupts. However, as per Ian, these interrupts aren't very useful and it is enough to simply provide an interface for accessing the diagnostic status on-demand. This patch adds a 2-channel digital input subdevice with an insn_bits handler to access this information. Signed-off-by: Chase Southwood <chase.southwood@gmail.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Cc: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: wlan-ng: coding style problem fixModestas Stankus2014-08-01
| | | | | | | | | | | | | | | | | | | | WARNING: break is not useful after a goto or return 201: FILE: drivers/staging/wlan-ng/p80211conv.c:201: + return 1; + break; Signed-off-by: Modestas Stankus <stankus.modestas@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: wlan-ng: fixing coding style problemsModestas Stankus2014-08-01
| | | | | | | | | | | | | | | | | | | | | | | | WARNING: Unnecessary space before function pointer arguments + int (*func) (struct mibrec *mib, WARNING: Missing a blank line after declarations + hfa384x_WPAData_t wpa; + if (isget) { Signed-off-by: Modestas Stankus <stankus.modestas@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: comedi: ii_pci20kc: request and ioremap memoryIan Abbott2014-08-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "ii_pci20kc" module is a comedi driver for Intelligent Instruments PCI-20001C carrier board and modules. Despite the name, this is actually an ISA board and uses 1K of ISA memory space (below 1M) for the main board plus up to three modules. The address is set by hardware jumpers. When the board is attached to Comedi via the `COMEDI_DEVCONFIG` ioctl and the driver's legacy "attach" handler, the base address is passed in. The driver currently uses that address as-is, which is a bad idea. It doesn't even reserve the memory region. Fix that by sanity checking the passed in address, reserving the memory region and ioremapping it. Replace the current "detach" handler `comedi_legacy_detach()` with a new handler `ii20k_detach()` which unmaps the memory and releases the region. 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>
| * staging: lustre: bitwise vs logical typoDan Carpenter2014-08-01
| | | | | | | | | | | | | | Bitwise AND was intended here obviously. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: dgnc: Remove unneeded dgnc_trace.c and dgnc_trace.hSeunghun Lee2014-08-01
| | | | | | | | | | | | | | | | | | Removes unneeded dgnc_trace.c and dgnc_trace.h CC: Lidza Louina <lidza.louina@gmail.com> CC: Mark Hounschell <markh@compro.net> Signed-off-by: Seunghun Lee <waydi1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: dgnc: rephrase commentSeunghun Lee2014-08-01
| | | | | | | | | | | | | | | | | | | | Rephrase comment to explain original intention of function. CC: Lidza Louina <lidza.louina@gmail.com> CC: Mark Hounschell <markh@compro.net> Suggested-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Seunghun Lee <waydi1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: comedi: ni_tio: remove some dead codeDan Carpenter2014-08-01
| | | | | | | | | | | | | | | | | | | | These conditions can never be true because "i" is always one more than NI_660X_MAX_RTSI_CHAN after the loop. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8723au: Fix static symbol sparse warningMiguel Oliveira2014-08-01
| | | | | | | | | | | | | | | | | | Fix sparse warning: drivers/staging/rtl8723au/core/rtw_efuse.c:579:5: warning: symbol 'efuse_GetCurrentSize23a' was not declared. Should it be static? by removing efuse_GetCurrentSize23a since its never used Signed-off-by: Miguel Oliveira <cmroliv@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8723au: usb_dvobj_init(): Remove unused variable 'pdev_desc'Jes Sorensen2014-08-01
| | | | | | | | | | Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8723au: Do not duplicate kernel provided USB macrosJes Sorensen2014-08-01
| | | | | | | | | | Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8723au: Remove never set struct pwrctrl_priv.bHWPowerdownJes Sorensen2014-08-01
| | | | | | | | | | Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8723au: Remove two never set variablesJes Sorensen2014-08-01
| | | | | | | | | | | | | | | | struct registry_priv.usbss_enable and struct pwrctrl_priv.bHWPwrPindetect are never set. Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8723au: RSSI_test is never setJes Sorensen2014-08-01
| | | | | | | | | | Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging:r8190: coding style: Fixed checkpatch reported ErrorSanjeev Sharma2014-08-01
| | | | | | | | | | | | | | | | This is a patch to the r8190_rtl8256.c file that fixes checkpatch reported space & coding style issues. Signed-off-by: Sanjeev Sharma <Sanjeev_Sharma@mentor.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging:r8180: coding style: Fixed too long linesSanjeev Sharma2014-08-01
| | | | | | | | | | | | | | | | This is a patch to the r8180_93cx6.h file that fixes long lines along with some additional warning. Signed-off-by: Sanjeev Sharma <Sanjeev_Sharma@mentor.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging:r8180: coding style: Fixed commenting styleSanjeev Sharma2014-08-01
| | | | | | | | | | | | | | | | This is a patch to the r8180_93cx6.c file that fixes commenting style warning Signed-off-by: Sanjeev Sharma <Sanjeev_Sharma@mentor.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: lustre: ptlrpc: lproc_ptlrpc.c - fix dereferenceing user space bufferAnil Belur2014-08-01
| | | | | | | | | | | | | | | | | | | | | | - this fixes sparse warning for directly deferencing user space buffer drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c:652:33: warning: incorrect type in argument 2 (different address spaces) drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c:652:33: expected void const [noderef] <asn:1>*from drivers/staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c:652:33: got char const *buffer Signed-off-by: Anil Belur <askb23@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: lustre: ldlm: ldlm_resource.c - fix dereferenceing user space bufferAnil Belur2014-08-01
| | | | | | | | | | | | | | | | | | | | | | - this fixes sparse warning for directly deferencing user space buffer ./lustre/ldlm/ldlm_resource.c:202:35: warning: incorrect type in argument 2 (different address spaces) ./lustre/ldlm/ldlm_resource.c:202:35: expected void const [noderef] <asn:1>*from ./lustre/ldlm/ldlm_resource.c:202:35: got char const *buffer Signed-off-by: Anil Belur <askb23@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * Staging: android: timed_gpio.c: improved logic of gpio_get_time()Murilo Opsfelder Araujo2014-08-01
| | | | | | | | | | | | | | | | This patch improves the logic of gpio_get_time() and, thereafter, makes checkpatch.pl happy. Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: visorchipset: fix sparse warnings about static declarationVincent Bernat2014-08-01
| | | | | | | | | | | | | | | | | | | | Some functions were prototyped as static but the actual definition wasn't. While this is valid (the function is static because the two declarations don't conflict and the first one is static), this makes sparse unhappy and cause confusion of normal people too. Signed-off-by: Vincent Bernat <vincent@bernat.im> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove MEMCMP_IOBenjamin Romer2014-08-01
| | | | | | | | | | | | | | | | | | This patch removes MEMCMP_IO from commontypes.h and fixes the one use of the macro so it calls uuid_cmp_le() instead. The old code was comparing UUIDs directly. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove MEMSET defineBenjamin Romer2014-08-01
| | | | | | | | | | | | | | | | Remove the redundant MEMSET define in commontypes.h and fix everyplace that uses it. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove UINTN typeBenjamin Romer2014-08-01
| | | | | | | | | | | | | | | | This patch removes UINTN from commontypes.h, using u64 in the one spot this type was used. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove unused defines from commontypes.hBenjamin Romer2014-08-01
| | | | | | | | | | | | | | Delete #defines that aren't used anywhere. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove non-kernel code from commontypes.hBenjamin Romer2014-08-01
| | | | | | | | | | | | | | | | This patch deletes everything in common types that was in the else section of a #ifdef __KERNEL__ block. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove S64 typeBenjamin Romer2014-08-01
| | | | | | | | | | | | | | | | This patch switches all use of the S64 typedef to use the kernel's s64 type instead. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove S32 typeBenjamin Romer2014-08-01
| | | | | | | | | | | | | | Delete the S32 type from commontypes.h since it wasn't being used. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove S16 typeBenjamin Romer2014-08-01
| | | | | | | | | | | | | | | | This patch switches all use of the S16 typedef to use the kernel's s16 type instead. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove S8 typeBenjamin Romer2014-08-01
| | | | | | | | | | | | | | Delete the S8 type from commontypes.h since it wasn't being used. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove U64 typeBenjamin Romer2014-08-01
| | | | | | | | | | | | | | | | This patch switches all use of the U64 typedef to use the kernel's u64 type instead. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove U32 typeBenjamin Romer2014-08-01
| | | | | | | | | | | | | | | | This patch switches all use of the U32 typedef to use the kernel's u32 type instead. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: unisys: remove U16 typeBenjamin Romer2014-08-01
| | | | | | | | | | | | | | | | This patch switches all use of the U16 typedef to use the kernel's u16 type instead. Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * Staging: rts5208: Replace custom macro with dev_dbgFabio Falzoi2014-07-30
| | | | | | | | | | | | | | Use dev_dbg macro to control tracing verbosity through dynamic debug facility. Signed-off-by: Fabio Falzoi <fabio.falzoi84@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * Staging: rts5208: Remove useless debug printsFabio Falzoi2014-07-30
| | | | | | | | | | | | | | Remove all debug printks used just to mark when we enter a function. Signed-off-by: Fabio Falzoi <fabio.falzoi84@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging/nvec: Use platform_get_irq()Thierry Reding2014-07-30
| | | | | | | | | | | | | | | | | | | | | | | | As opposed to platform_get_resource(), the platform_get_irq() function has special code to handle driver probe deferral when booting using DT and where an interrupt provider hasn't been registered yet. While this is unlikely to become an issue for nvec, platform_get_irq() is the recommended way to get at interrupts. Signed-off-by: Thierry Reding <treding@nvidia.com> Acked-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging/nvec: Do not pass resource to mfd_add_devices()Thierry Reding2014-07-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The mfd_add_devices() function takes a struct resource * as fifth argument, but the nvec driver passes in a void __iomem *. The driver gets away with it because none of the subdevices ever directly access the registers. Since subdevices never need to access the registers we can simply pass NULL instead. Signed-off-by: Thierry Reding <treding@nvidia.com> Acked-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * Staging: android: timed_output.c: use kstrtoint() instead of sscanf()Murilo Opsfelder Araujo2014-07-30
| | | | | | | | | | | | | | | | | | This patch makes checkpatch.pl happy by fixing the following warning: WARNING: Prefer kstrto<type> to single variable sscanf Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8188eu: Remove wrapper function ↵navin patidar2014-07-30
| | | | | | | | | | | | | | _rtw_reordering_ctrl_timeout_handler() Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8188eu: Remove unused function rtw_os_read_port()navin patidar2014-07-30
| | | | | | | | | | Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8188eu: Remove wrapper function _addba_timer_hdl()navin patidar2014-07-30
| | | | | | | | | | Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8188eu: Remove wrapper function _link_timer_hdl()navin patidar2014-07-30
| | | | | | | | | | Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8188eu: Remove wrapper function _survey_timer_hdl()navin patidar2014-07-30
| | | | | | | | | | Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8188eu: Remove wrapper function _dynamic_check_timer_handlder()navin patidar2014-07-30
| | | | | | | | | | Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8188eu: Remove wrapper function _rtw_scan_timeout_handler()navin patidar2014-07-30
| | | | | | | | | | Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8188eu: Remove wrapper function rtw_join_timeout_handler()navin patidar2014-07-30
| | | | | | | | | | Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: rtl8188eu: Remove unused member MultiFunc from struct hal_data_8188enavin patidar2014-07-30
| | | | | | | | | | Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| * staging: dgnc: removes unused if defined codeSeunghun Lee2014-07-30
| | | | | | | | | | | | | | | | | | | | | | DGNC_TRACER and TRC_TO_KMEM are never defined. This patch removes if defined DGNC_TRACER and TRC_TO_KMEM code. CC: Lidza Louina <lidza.louina@gmail.com> CC: Mark Hounschell <markh@compro.net> Signed-off-by: Seunghun Lee <waydi1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>