summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* staging:iio: Setup buffer access functions when allocating the bufferLars-Peter Clausen2012-02-0924-83/+34Star
| | | | | | | | | Setup the buffer access functions in the buffer allocate function. There is no need to let each driver handle this on its own. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging:iio: ak8975: add of_match table for device-tree probingOlof Johansson2012-02-091-0/+8
| | | | | | | | | | Just like isl29018; trivial addition. Using both asahi-kasei,ak8975 and the non-prefixed version (I couldn't figure out if Asahi Kasei had a stock symbol to use, I only found numerical indexes for their stock info). Signed-off-by: Olof Johansson <olof@lixom.net> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging:iio: isl29018: add of_match table for device-tree probingOlof Johansson2012-02-091-0/+7
| | | | | | | | | As simple as can be right now; just one ID and no custom properties to parse. Signed-off-by: Olof Johansson <olof@lixom.net> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: comedi: logical || vs bitwise |Dan Carpenter2012-02-091-2/+2
| | | | | | | | | These are bitfields and the intend was to OR them together. A logical OR here is simply 1. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: ni_pcidio: Support trailing edge external triggerIan Abbott2012-02-091-4/+15
| | | | | | | | | | | | | | | | This patch is ported over by me (Ian Abbott) from the out-of-tree Comedi git repository at "git://comedi.org/git/comedi/comedi.git". The original patch is by Nicholas Nell. The patch adds support for trailing (falling) edge external triggers for scans in asynchronous command support in the ni_pcidio driver. This is supported at least on the PCI-DIO_32HS and PCI-6533 boards; not sure about the other boards. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Cc: Nicholas Nell <nicholas.nell@colorado.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: ni_pcidio: Add comedi_poll supportIan Abbott2012-02-091-3/+23
| | | | | | | | | | | | | | | This patch is ported over by me (Ian Abbott) from the out-of-tree Comedi git repository at "git://comedi.org/git/comedi/comedi.git". The original patch is by Nicholas Nell. The patch adds support for the COMEDI_POLL ioctl to the ni_pcidio driver. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Cc: Nicholas Nell <nicholas.nell@colorado.edu> Cc: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: ni_pcidio: Grab MITE spinlock while preparing DMA.Ian Abbott2012-02-091-5/+10
| | | | | | | | | | When setting up the DMA for 'read' streaming acquisition command, grab the MITE channel spinlock before preparing and arming the DMA. Change inspired by ni_ai_setup_MITE_dma() in ni_mio_common.c. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: ni_pcidio: Mark buffer for writing when setting up DMA.Ian Abbott2012-02-091-0/+3
| | | | | | | | | | | | When setting up the DMA for 'read' streaming acquisition on the DIO subdevice, mark the whole buffer as writable before starting the DMA. This prevents a spurious detection of a DMA overwrite of good data during the first interrupt. Problem reported by Nicholas Nell. Fix suggested by Frank Mori Hess. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: adv_pci_dio: Advantech PCI-1739U supportIan Abbott2012-02-092-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is ported over by me (Ian Abbott) from the out-of-tree Comedi git repository at "git://comedi.org/git/comedi/comedi.git". The original patch is by Nicholas Nell. ----- Advantech PCI-1739U support Hello, I've added a bit of simple configuration to adv_pci_dio.c in order to make the PCI-1739U work with the adv_pci_dio driver. I have tested inputs only so far but they seem to work. A git style patch is attached. Thanks, -- Nicholas Nell Professional Research Assistant University of Colorado ----- Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Cc: Nico Nell <nicholas.nell@colorado.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: me4000: Check for unsupported INSN_CONFIG.Ian Abbott2012-02-091-3/+9
| | | | | | | | | | | The INSN_CONFIG handler for the DIO subdevice should error out for unsupported configuration instruction codes. Also fix incorrect use of constant COMEDI_OUTPUT where INSN_CONFIG_DIO_OUTPUT was meant. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: dt2801: do INSN_CONFIG properly for DIO subdevice.Ian Abbott2012-02-091-2/+10
| | | | | | | | Handle INSN_CONFIG_DIO_INPUT, INSN_CONFIG_DIO_OUTPUT and INSN_CONFIG_DIO_QUERY in data[0]. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: comedi: ni_pcimio: Add support for NI PXIe-6251Ian Abbott2012-02-091-3/+24
| | | | | | | | | | | | | | Paul Fulmek reports that PXIe-6251 works the same as the existing PCIe-6251 and just needs the new PCI device ID adding to ni_pci_table[] and a new entry adding to ni_boards[] based on the existing entry for PCIe-6251. The new entry has PCI device ID 0x72e8 and board name "pxie-6251". Thanks Paul! Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: wlan-ng: cap the ssid lengthDan Carpenter2012-02-091-0/+1
| | | | | | | | We're getting the ssid length from the scan here. Let's cap it before doing the memcpy(). Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging, media, easycap: Fix mem leak in easycap_usb_probe()Jesper Juhl2012-02-091-0/+1
| | | | | | | | | | | | If allocating 'pdata_urb' fails, the function will return -ENOMEM without freeing the memory allocated, just a few lines above, for 'purb' and will leak that memory when 'purb' goes out of scope. This patch resolves the leak by freeing the allocated storage with usb_free_urb() before the return. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: Fix typo in ieee80211_rx.cMasanari Iida2012-02-091-1/+1
| | | | | | | | Correct spelling "suppported" to "supported" in drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c Signed-off-by: Masanari iida<standby24x7@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: sbe-2t3e3: logical || vs bitwise |Dan Carpenter2012-02-091-1/+1
| | | | | | | Bitwise OR was clearly intended here. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/mei: TODO : how to handle example code after unstagingTomas Winkler2012-02-091-0/+3
| | | | | Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/mei: add mei user space exampleTomas Winkler2012-02-091-0/+479
| | | | | | | | | | | | | | | | | | | | | | | | this example tries to connect to amt host interface client and retrieve versions of its sub components When AMT is enabled an output might look like that: Intel AMT: ENABLED Flash: 6.1.0 Netstack: 6.1.0 AMTApps: 6.1.0 AMT: 6.1.0 Sku: 258 VendorID: 8086 Build Number: 1042 Recovery Version: 6.1.0 Recovery Build Num: 1042 Legacy Mode: False otherwise: Intel AMT: DISABLED Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/mei: normalize prototypes of all read buffersTomas Winkler2012-02-094-30/+18Star
| | | | | | | | 1. convert all read buffers to unsigned char and drop useless castings 2. simplify mei_read_slots implementation Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/mei: update copyright year to 2012Tomas Winkler2012-02-0911-70/+75
| | | | | | | | | | 1. Update Copyright to 2012 2. Also fix mei.h copyright format checkpaatch complained: WARNING: please, no spaces at the start of a line Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: ft1000: ft1000-pcmia: fix space required after that ', ' in ↵Kashyap Gada2012-02-091-3/+3
| | | | | | | | | | ft1000_proc.c This is a patch to the ft1000_proc.c that fixes up space required after ',' errors found by the checkpatch.pl tool Signed-off-by: Kashyap Gada <gada.kashyap@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: usbip: removed #if 0'd out codeBart Westgeest2012-02-092-48/+0Star
| | | | | Signed-off-by: Bart Westgeest <bart@elbrys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: usbip: changed function return type to voidBart Westgeest2012-02-093-10/+6Star
| | | | | | | The function usbip_pad_iso never returns anything but 0 (success). Signed-off-by: Bart Westgeest <bart@elbrys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: usbip: removed unused structure fieldBart Westgeest2012-02-091-1/+0Star
| | | | | Signed-off-by: Bart Westgeest <bart@elbrys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: drm/omap: Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(..Thomas Meyer2012-02-091-1/+1
| | | | | | | | | | | The semantic patch that makes this change is available in scripts/coccinelle/api/err_cast.cocci. More information about semantic patching is available at http://coccinelle.lip6.fr/ Signed-off-by: Thomas Meyer <thomas@m3y3r.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: rts5139: fix pointer coding styleMárton Németh2012-02-097-16/+16
| | | | | | | | | This will remove the following checkpatch.pl error: ERROR: "foo * bar" should be "foo *bar" Signed-off-by: Márton Németh <nm127@freemail.hu> Acked-by: edwin_rong <edwin_rong@realsil.com.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* Staging: quickstart: Use pr_err and pr_info for logsSzymon Janc2012-02-091-8/+8
| | | | | Signed-off-by: Szymon Janc <szymon@janc.net.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: remove CONFIG_TIDSPBRIDGE_DEBUGVíctor Manuel Jáquez Leal2012-02-093-14/+6Star
| | | | | | | | | | | | | | Since all the asserts and DBC macros are gone, the kconfig macro CONFIG_TIDSPBRIDGE_DEBUG is not almost used, but for printing trace messages. Since it is almost not used, I don't see any case for keep it churning the configuration menu. This patch removes completely the kconfig macro CONFIG_TIDSPBRIDGE_DEBUG, using only TIDSPBRIDGE_BACKTRACE for enabling the debug trace messages. Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: remove dbc.hVíctor Manuel Jáquez Leal2012-02-0928-106/+0Star
| | | | | | | All the macros in dbc.h are removed now so this patch removes it completely. Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: remove DBC_ASSERT macroVíctor Manuel Jáquez Leal2012-02-0919-151/+2Star
| | | | | | | | | | | This macro is only valid when CONFIG_TIDSPBRDIGE_DEBUG is enabled and it only prints a log message, it is not a real assertion mechanism like BUG_ON() or WARN_ON(). It is better to remove them: less code to maintain. Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: remove DBC_ENSURE and DBC_REQUIREDVíctor Manuel Jáquez Leal2012-02-0924-946/+3Star
| | | | | | | | | The kernel does not use a "Design by Contract" approach, and it is only activated in the module if CONFIG_TIDSPBRDIGE_DEBUG is enabled, so they are executed rarely. It is better to remove them: less code to maintain. Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: Rename module from bridgedriver to tidspbridgeJoe Perches2012-02-091-2/+2
| | | | | | | | | | | | | | | tidspbridge when built as a module is named bridgedriver. bridgedriver is not a particularly good module name. tidspbridge is what the source is named. That seems a more appropriate module name too as it describes the hardware function better. Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Omar Ramirez Luna <omar.ramirez@ti.com> Acked-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: use the driver name stringVíctor Manuel Jáquez Leal2012-02-091-4/+1Star
| | | | | | Instead of assign it to a global variable which is not used anymore. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: clean up bridge_mmap()Víctor Manuel Jáquez Leal2012-02-091-3/+2Star
| | | | | | | | The variable offset is not used but in the debug log, so I don't see reason to calculate it here. Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: remove trivial assertVíctor Manuel Jáquez Leal2012-02-091-3/+1Star
| | | | | | | | | The function dsp_deinit() always return true, so assert its output is pointless. As consequence the variable were the returned value is stored, is no longer needed. Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: remove header inclusionsVíctor Manuel Jáquez Leal2012-02-091-7/+0Star
| | | | | | | drv_interface.c include several header files that are not really used. Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: silence the compilerVíctor Manuel Jáquez Leal2012-02-091-2/+3
| | | | | | | | | | | | | When compiling this report is raised by the compiler: CC [M] drivers/staging/tidspbridge/rmgr/drv_interface.o drivers/staging/tidspbridge/rmgr/drv_interface.c: In function 'bridge_mmap': drivers/staging/tidspbridge/rmgr/drv_interface.c:275:2: warning: format '%lx' expects type 'long unsigned int', but argument 9 has type 'pgprot_t' This patch fixes that warning message. Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: Lindent to drv_interface.cVíctor Manuel Jáquez Leal2012-02-091-6/+6
| | | | | | | | | | | | No functional changes. According to Lindent, the file drv_internface.c had some lines with bad indentation. This commit is the output of Lindent. Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: remove unused headerVíctor Manuel Jáquez Leal2012-02-092-186/+155Star
| | | | | | | | | | | | | No functional changes. The header file drv_interface.h was only used locally, hence there's no need to have it. Also the only prototyped functions were the file_operations callbacks, then this commit moves them up to avoid prototyping too. Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: tidspbridge: more readable codeVíctor Manuel Jáquez Leal2012-02-091-7/+6Star
| | | | | | | | Uppercase function names are not pretty. Also the code flow readability is enhanced. Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: xgifb: checkpatch cleanup printk() -> pr_lvl()Sam Hansen2012-02-091-45/+43Star
| | | | | | | | | Rewrote code to use pr_lvl() instead of printk(). There are still a few instances of printk(), mainly in the debug code which looks like it's going to be dropped/rewrote (most of it is blocked out). Signed-off-by: Sam Hansen <solid.se7en@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: xgifb: checkpatch cleanup __func__Sam Hansen2012-02-091-1/+1
| | | | | | | Replaced an instance of __FUNCTION__ with __func__ in XGI_main_26.c. Signed-off-by: Sam Hansen <solid.se7en@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: xgifb: checkpatch cleanup bracesSam Hansen2012-02-091-7/+3Star
| | | | | | | | Cleaned up XGI_main_26.c and removed some unneeded braces to keep with code conventions. Signed-off-by: Sam Hansen <solid.se7en@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging: xgifb: pr_fmt kbuild macroSam Hansen2012-02-091-0/+2
| | | | | | | Added the kbuild macro pr_fmt() to XGI_main_26.c Signed-off-by: Sam Hansen <solid.se7en@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/xgifb: Remove remaining duplicate structs and definesPeter Huewe2012-02-092-133/+10Star
| | | | | | | | This patch removes the now unused structs and defines which were mere duplicates of the ones in the sgi headers Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/xgifb: Use structs and defines from the sis headersPeter Huewe2012-02-094-66/+66
| | | | | | | | | This patch removes the usage of some xgi structs and defines and replaces them with the _identical_ structs from the sis headers. Thus the old structs and defines can be removed. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/xgifb: Include sis headersPeter Huewe2012-02-095-2/+13
| | | | | | | | | | | | This patch includes the headers of the sis driver and reorders some includes. Since the xgi driver used to redefine a lot of stuff from the sis driver, we can simply include the headers of the sis driver itself, so we can remove duplicated stuff later on. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging/xgifb: Remove unsupported mode LCD_320x480Peter Huewe2012-02-091-10/+0Star
| | | | | | | | | | | | | | This patch removes the probed mode LCD_320x480 which isn't supported anyway since this mode falls through to the default (=invalid) mode in the XGIfb_validate_mode function (see line 529 ff. for details. the commented out code for this mode is also removed). By removing this assignment, we can use the LCD_TYPEs from the sis driver without modifications. Signed-off-by: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging, vt6656/wpactl.c: Fix mem leak in wpa_ioctl()Jesper Juhl2012-02-091-0/+1
| | | | | | | | | | | | If we hit the default case in the switch statement in wpa_ioctl() we'll leak the memory allocated to 'param' when the variable goes out of scope without having been assigned to anything. This patch fixes the leak by kfree()'ing the memory before we return from the function. Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* staging, vt6656/wpactl.c: A basic style cleanupJesper Juhl2012-02-091-518/+418Star
| | | | | | | | | | | | | | | | | | This patch cleans up the coding style in drivers/staging/vt6656/wpactl.c to closer match the generally accepted kernel CodingStyle. It is by no means a "make it perfect" patch, but it does get the file a fair bit closer to matching the accepted style (whomever was involved in the evolution of this file seriously need to configure their editors to maintain a consistent style - it was a mess). Besides pure style cleanups I also took the liberty of removing some pointless parens, some unneeded casts and removing some commented out code (it was obviously not used and git has it if it's ever needed in the future). Signed-off-by: Jesper Juhl <jj@chaosbits.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>