summaryrefslogtreecommitdiffstats
path: root/drivers/staging
Commit message (Collapse)AuthorAgeFilesLines
* staging: asus_oled: Change printk calls to dev_xxxJonathan Brett2012-08-151-10/+8
| | | | | | | | | - Use dev_err whenever a struct device * is present - None of the printk calls had levels set, but looked like they should probably be dev_err Signed-off-by: Jonathan Brett <jonbrett.dev@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: amplc_dio200: replace macros with inline functionsIan Abbott2012-08-151-10/+17
| | | | | | | | | | | Replace the IS_ISA_BOARD() and IS_PCI_BOARD() functionlike macros with inline functions is_isa_board() and is_pci_board(). Also call is_pci_board() in dio200_find_pci_board() instead of an explicit comparison operator. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: make attach handler optionalIan Abbott2012-08-151-3/+16
| | | | | | | | | | | | | | | | Some low-level Comedi drivers no longer support manual configuration of devices with the COMEDI_DEVCONFIG ioctl (used by the comedi_config program). For those drivers, the 'attach_pci' or 'attach_usb' handler will be set in the struct comedi_driver to configure devices automatically (via comedi_pci_auto_config() or comedi_usb_auto_config()). Their 'attach' handlers are redundant but the the comedi core module currently requires it to be set. Make the 'attach' handler optional and issue a warning if something wants to call it. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: dnya_pci10xx: remove unused DRV_NAMEH Hartley Sweeten2012-08-151-1/+0
| | | | | | | | This define is not used in the driver. Remove it. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: dnya_pci10xx: remove unneeded boardinfo codeH Hartley Sweeten2012-08-151-36/+2
| | | | | | | | | The boardinfo code is not needed by this driver. Only one board type is supported. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: dnya_pci10xx: move boardinfo values into subdevice setupH Hartley Sweeten2012-08-151-23/+9
| | | | | | | | | | | | | There is only one "boardtype" actually supported by this driver. The second entry in the boardinfo is a dummy entry that would result in an unusable device. Remove the boardinfo fields and just use the open coded values in the subdevice setup. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: dnya_pci10xx: remove unused fields in the boardinfoH Hartley Sweeten2012-08-151-8/+0
| | | | | | | | | The *_bits information in the boardinfo is not used by the driver. Remove it. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: dnya_pci10xx: cleanup the analog output rangeH Hartley Sweeten2012-08-151-12/+1
| | | | | | | | | | | | The analog output channels on this board only support a single range, 0-10V unipolar. This range is available as an exported symbol from the comedi core and "range_unipolar10". Use that instead of duplicating the range in this driver and remove the information from the boardinfo. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: dnya_pci10xx: use attach_pci callbackH Hartley Sweeten2012-08-151-53/+35
| | | | | | | | | | | | | Convert this PCI driver to use the comedi PCI auto config attach mechanism by adding an attach_pci callback function. Since the driver does not require any external configuration options, disable the legacy attach by making the attach simply return -ENOSYS. This removes the need to walk the pci bus to find the pci_dev and the need for the pci_dev_put() in the detach. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: dnya_pci10xx: remove thisboard and devpriv macrosH Hartley Sweeten2012-08-151-8/+15
| | | | | | | | | | These macros rely on local variables having a specific name. Replace them with local variables where used. Use the comedi_board() helper to get the thisboard pointer. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: omapdrm: Expose the OMAP Z-Order property through DRMAndre Renaud2012-08-152-0/+20
| | | | | | | | Added support for zorder changes through DRM plane properties Signed-off-by: Andre Renaud <andre@bluewatersys.com> Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: drm/omap: add rotation propertiesRob Clark2012-08-158-46/+311
| | | | | | | | Use tiled buffers for rotated/reflected scanout, with CRTC and plane properties as the interface for userspace to configure rotation. Signed-off-by: Rob Clark <rob@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: adl_pci7x3x: fix pointer-to-int-cast warningH Hartley Sweeten2012-08-141-2/+2
| | | | | | | | | | | | | | | | | | | This driver uses the void *private variable in the comedi_subdevice to pass the offset needed to read/write the appropriate register to get/set the channels for the subdevice. The adl_pci7x3x_do_insn_bits() and adl_pci7x3x_di_insn_bits() functions were retrieving this offset by casting the s->private value as an unsigned int. On 64-bit builds this results in a warning: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] Fix these warnings by casting the void * to an unsigned long. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: line6: variax.c: Eliminated remaining strict_stroul()sJohannes Thumshirn2012-08-141-4/+4
| | | | | | | | Eliminated remaining calls to strict_stroul() and replaced them with strict_kstrtou8(). Signed-off-by: Johannes Thumshirn <morbidrsa@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: amplc_dio200: add helper macros to check bus typeIan Abbott2012-08-141-4/+7
| | | | | | | | | Add helper macro IS_ISA_BOARD(board) to check if the driver supports ISA boards and this is an ISA board, and IS_PCI_BOARD(board) to check if the driver supports PCI boards and this is a PCI board. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: amplc_dio200: check bus type in detach routineIan Abbott2012-08-141-6/+8
| | | | | | | | | When detaching the device in dio200_detach() mirror the bus type checks performed by dio200_attach(). The existing tests are safe but rely on dev->iobase being 0 when comedi_to_pci_dev(dev) is NULL. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: amplc_dio200: abbreviate IS_ENABLED()Ian Abbott2012-08-141-16/+15
| | | | | | | | | | The IS_ENABLED(CONFIG_COMEDI_AMPLC_DIO200_ISA) and IS_ENABLED(CONFIG_COMEDI_AMPLC_DIO200_PCI) macro calls are a bit long-winded. Define a couple of macros DO_ISA and DO_PCI as abbreviations for them. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: xgifb: fix bitwise vs logical bugDan Carpenter2012-08-141-1/+1
| | | | | | | | | | This is a static checker fix and not something I can test. The intent of the code here is to set some bit flags. For a logical OR the ">> 1" shift wouldn't make a difference. So it should be using a bitwise OR. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging "vme" Fix typos.Justin P. Mattock2012-08-141-4/+4
| | | | | | Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Acked-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* zsmalloc: collapse internal .h into .cSeth Jennings2012-08-132-150/+131
| | | | | | | | | | | | | | The patch collapses in the internal zsmalloc_int.h into the zsmalloc-main.c file. This is done in preparation for the promotion to mm/ where separate internal headers are discouraged. Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Signed-off-by: Minchan Kim <minchan@kernel.org> Acked-by: Nitin Gupta <ngupta@vflare.org> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging "usbip" Fix typos.Justin P. Mattock2012-08-132-3/+3
| | | | | Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: speakup: i18n.c: Fix leak in msg_set()Jesper Juhl2012-08-131-0/+1
| | | | | | | | | | If we end up returning -EINVAL from the function we will leak the memory allocated to 'newstr' which has been allocated but not yet assigned to anything. Fix the leak by properly freeing the memory again before we return. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: rtl8192u: Fix typo in staging/rtl8192uMasanari Iida2012-08-137-10/+10
| | | | | | | Correct spelling typo in staging/rtl8192u Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: rtl8187se: Fix typo in staging/rtl8187seMasanari Iida2012-08-134-6/+11
| | | | | | | Correct spelling typo and adjust comment line length. Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: rtl8192e: Fix typo in staging/rtl8192eMasanari Iida2012-08-133-7/+7
| | | | | | | Correct spelling typo in staging/rtl8192e. Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: ft1000: Replace timeout values with USB_CTRL_G(S)ET_TIMEOUT.Marek Belisko2012-08-132-8/+6
| | | | | 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.Marek Belisko2012-08-131-1/+1
| | | | | | | | 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>
* staging: zsmalloc: add page table mapping methodSeth Jennings2012-08-132-54/+134
| | | | | | | | | | | | | | | This patchset provides page mapping via the page table. On some archs, most notably ARM, this method has been demonstrated to be faster than copying. The logic controlling the method selection (copy vs page table) is controlled by the definition of USE_PGTABLE_MAPPING which is/can be defined for any arch that performs better with page table mapping. Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Acked-by: Minchan Kim <minchan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: zsmalloc: prevent mappping in interrupt contextSeth Jennings2012-08-131-0/+8
| | | | | | | | | | Because we use per-cpu mapping areas shared among the pools/users, we can't allow mapping in interrupt context because it can corrupt another users mappings. Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Acked-by: Minchan Kim <minchan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: zsmalloc: s/firstpage/page in new copy map funcsSeth Jennings2012-08-131-6/+6
| | | | | | | | | | | | | firstpage already has precedent and meaning the first page of a zspage. In the case of the copy mapping functions, it is the first of a pair of pages needing to be mapped. This patch just renames the firstpage argument to "page" to avoid confusion. Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Acked-by: Minchan Kim <minchan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: panel: fix checkpatch warningsToshiaki Yamane2012-08-131-2/+2
| | | | | | | | | | | | Now checkpatch clean. $ find drivers/staging/panel -name "*.[ch]"|xargs ./scripts/checkpatch.pl \ -f --terse --nosummary|cut -f3- -d":"|sort |uniq -c|sort -n 2 WARNING: Single statement macros should not use a do {} while (0) loop Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: r8712u: Reduce maximum receive buffer size to a more sensible valueLarry Finger2012-08-131-1/+1
| | | | | | | | | | | The current value for the maximum receive buffer size is 30720, which is too large. For long-running systems, memory fragmentation may make it difficult to obtain the buffers of O(2) needed for aggregation. Buffers of O(3) are even worse, particularly when not needed. The new size is set to 9100, which will allow aggregation. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: nvec: fix coding style issuesMarc Dietrich2012-08-131-2/+4
| | | | | | | | | This commit fixes coding style issues that includes long lines. Based on the original patch submitted by Adnan Ali <adnan.ali@codethink.co.uk> Signed-off-by: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging rtl8192e: Declare MODULE_FIRMWARE usageTim Gardner2012-08-133-4/+12
| | | | | | | | | | Cc: Larry Finger <Larry.Finger@lwfinger.net> Cc: Mike McCormack <mikem@ring3k.org> Cc: wlanfae <wlanfae@realtek.com> Cc: Sean MacLennan <seanm@seanm.ca> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Sean MacLennan <seanm@seanm.ca> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: wlan-ng: use %*phC to hexdump small buffersAndy Shevchenko2012-08-131-12/+6
| | | | | Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: bcm: print small buffers with %*phAndy Shevchenko2012-08-132-47/+36
| | | | | | Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: nvec: use %*ph to dump small buffersAndy Shevchenko2012-08-131-2/+1
| | | | | | | | Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: ac100@lists.launchpad.net Acked-by: Julian Andres Klode <jak@jak-linux.org> Acked-By: Marc Dietrich <marvin24@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: xgifb: print small buffers via %*phAndy Shevchenko2012-08-131-10/+3
| | | | | | Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging:ccg: Fix missing brackets for sizeof (found by sparse).Marek Belisko2012-08-131-1/+1
| | | | | | | | | | Fix following: WARNING: sizeof fsg should be sizeof(fsg) + memset(&fsg, 0, sizeof fsg); Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Reviewed-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: gdm72xx: fix reference counting in gdm_wimax_event_initBen Chan2012-08-131-6/+10
| | | | | | | | | This patch fixes the commit "staging/gdm72xx: cleanup little at gdm_wimax_event_rcv" (8df858ea76b76dde9a39d4edd9aaded983582cfe), which mishandles the reference counting of wm_event. Signed-off-by: Ben Chan <benchan@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: ozwpan: Bump version numberRupesh Gujare2012-08-131-1/+1
| | | | | | | | Bump version numbers to keep in sync with internal version information. Signed-off-by: Rupesh Gujare <rgujare@ozmodevices.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: ozwpan: isoc latency for audio burstRupesh Gujare2012-08-135-8/+26
| | | | | | | | Set audio latency. This fixes issue where audio clips heard during link outage. Signed-off-by: Rupesh Gujare <rgujare@ozmodevices.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: ozwpan: Return correct actual_length to userlandRupesh Gujare2012-08-131-6/+8
| | | | | | | | This fixes issue where wrong retrun value was received by userland application after writing data to raw hid device. Signed-off-by: Rupesh Gujare <rgujare@ozmodevices.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: ozwpan: Insulate driver from HZ valueRupesh Gujare2012-08-132-5/+5
| | | | | | | | This patch fixes issue caused due to different HZ value on system which do not have HZ=1000 Signed-off-by: Rupesh Gujare <rgujare@ozmodevices.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: ozwpan: buffer frame if urb not available.Rupesh Gujare2012-08-131-4/+63
| | | | | | | | For interrupt end point buffer frames, if urb is not available & give back as soon as urb is received from usb core. Signed-off-by: Rupesh Gujare <rgujare@ozmodevices.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/crystalhd: unregister chardev when class_create fails in ↵Devendra Naga2012-08-131-1/+3
| | | | | | | | | chd_dec_init_chdev we missed a unregiser_chrdev if the class_create and subsequent function calls / checks fail Signed-off-by: Devendra Naga <develkernel412222@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/crystalhd: assign PTR_ERR at fail cases to rc in chd_dec_init_chdevDevendra Naga2012-08-131-0/+2
| | | | | | | | the rc assignment to PTR_ERR at fail cases of class_create and device_create are missed out, return proper error rather than returning -ENODEV. Signed-off-by: Devendra Naga <develkernel412222@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: line6: pcm.c: Changed simple_strtoul to kstrtointJohannes Thumshirn2012-08-131-1/+7
| | | | | | | | Changed call to simple_strtoul to kstrtoint in pcm_set_impulse_volume(...) Signed-off-by: Johannes Thumshirn <morbidrsa@googlemail.com> Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: omapdrm: Fix DMM sparse warningsAndy Gross2012-08-131-2/+2
| | | | | | | | | | | | | | | | Fix the following sparse warnings: drivers/staging/omapdrm/omap_dmm_tiler.c:123:13: warning: symbol 'omap_dmm_irq_handler' was not declared. Should it be static? drivers/staging/omapdrm/omap_dmm_tiler.c:370:24: warning: Using plain integer as NULL pointer Signed-off-by: Andy Gross <andy.gross@ti.com> Signed-off-by: Rob Clark <rob.clark@linaro.org> Reviewed-by: Sumit Semwal <sumit.semwal@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: drm/omap: remove reclaim_buffers callbackChandrabhanu Mahapatra2012-08-131-1/+0
| | | | | | | | | | | | | The reclaim_buffers callback has already been removed by Daniel Vetter <daniel.vetter@ffwll.ch> with his patch "drm: kill reclaim_buffers callback" (b0071efe82). As a result the kernel compilation fails with omapdrm support and so the callback for reclaim_buffers is being removed from omapdrm. Signed-off-by: Chandrabhanu Mahapatra <cmahapatra@ti.com> Reviewed-by: Sumit Semwal <sumit.semwal@ti.com> Signed-off-by: Rob Clark <rob@ti.com> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
OpenPOWER on IntegriCloud