summaryrefslogtreecommitdiff
path: root/drivers/staging
AgeCommit message (Collapse)AuthorFilesLines
2012-11-30staging:iio:ad7793: Implement stricter id checkingLars-Peter Clausen1-1/+9
Instead of checking whether the id of the current device matches the id of any device supported by the driver, check whether it matches the id of the device which the driver was instantiated for. This makes sure that the driver is not accidentally instantiated for the wrong device. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-30staging:iio:ad7793: Move register definitions from header to sourceLars-Peter Clausen2-93/+93
The only user of the register definitions is the driver itself, so move them from the header file to the driver source file. The header file now only contains the platform data struct. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-30staging:iio:ad7793: Rework regulator handlingLars-Peter Clausen2-21/+26
Rework the regulator handling of the driver to match more closely what we do in other drivers. Make the regulator non-optional if a external reference is used. Also dispose the option of specifying the reference voltage via platform data. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-30staging:iio:ad7793: Rework platform dataLars-Peter Clausen2-9/+123
Currently the platform data for the ad7793 consist just out of the raw default register settings. This has some downsides, for one we actually don't want to make all bits configurable and secondly not all register settings are actually valid. This patch exposes all the options which should be configurable via platform data as induvidual platform data struct fields. This also allows us to document the different settings via proper kernel doc. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-30staging:iio:ad7793: Use kstrtol instead of strict_strtolLars-Peter Clausen1-1/+1
strict_strtol is deprecated in favor of kstrtol. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-30staging:iio:ad7793: Use usleep_range instead of msleepLars-Peter Clausen1-1/+1
It is recommended to use usleep_range instead of msleep for durations smaller than a 20ms. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-30staging:iio:ad7793: Fix temperature scaleLars-Peter Clausen1-1/+1
The temperature scale was off by a factor of 1000. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-30staging:iio:ad7793: Fix VDD monitor scaleLars-Peter Clausen1-1/+1
The VDD monitor scale was off by a factor of 10. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-29Merge tag 'omap-for-v3.8/cleanup-timer-signed' of ↵Olof Johansson1-1/+0
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup Timer clean-up to get us closer to moving timer code to drivers, and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board or devicetree provided timer configuration. Note that these changes are on top of the recent timer fixes. By Jon Hunter (32) and others via Tony Lindgren * tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (71 commits) ARM: OMAP3: cm-t3517: use GPTIMER for system clock ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER ARM: OMAP2+: Fix compiler warning for 32k timer ARM: OMAP: Remove unnecessary inclusion of dmtimer.h ARM: OMAP: Add platform data header for DMTIMERs ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration ARM: OMAP2+: Remove unnecessary local variable in timer code ARM: OMAP: Don't store timers physical address ARM: OMAP: Define omap_dm_timer_prepare function as static ARM: OMAP: Clean-up dmtimer reset code ARM: OMAP: Remove __omap_dm_timer_set_source function ARM: OMAP: Remove unnecessary call to clk_get() ARM: OMAP: Add dmtimer interrupt disable function ARM: OMAP: Fix spurious interrupts when using timer match feature ARM: OMAP: Don't restore DMTIMER interrupt status register ARM: OMAP: Don't restore of DMTIMER TISTAT register ARM: OMAP: Fix dmtimer reset for timer1 ARM: OMAP2+: Don't use __omap_dm_timer_reset() ARM: OMAP2/3: Define HWMOD software reset status for DMTIMERs ARM: OMAP3: Correct HWMOD DMTIMER SYSC register declarations ... Change/change conflict in arch/arm/mach-omap2/board-cm-t3517.c. Signed-off-by: Olof Johansson <olof@lixom.net>
2012-11-29staging: gdm72xx: unlock on error in init_usb()Dan Carpenter1-0/+1
We recently added locking here and there was an error path which is missing an unlock. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-29staging: panel: pass correct lengths to keypad_send_key()Dan Carpenter1-4/+4
We changed the sizeof() statements in 429ccf058b "staging:panel: Fixed coding conventions." so that they could fit inside the 80 character line limit. Unfortunately, the new sizeof() statements are a smaller size. This reverts it. There isn't a nice way to stay within the 80 character limit without a re-work so I've gone over. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-29staging: sb105x: fix potential NULL pointer dereference in mp_chars_in_buffer()Wei Yongjun1-1/+2
The dereference to 'state' should be moved below the NULL test. Cc: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-29staging: comedi: addi_apci_2032: fix interrupt supportH Hartley Sweeten1-56/+100
This board supports two interrupt sources: VCC : detects when the external supply voltage drops below 5V CC : over temperature diagnostic Currently the interrupt support is tied into the digital output subdevice. It's also broken since it does not follow the comedi API. Create a new digital input subdevice to handle the interrupts. 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>
2012-11-29staging: comedi: addi_apci_2032: move i_APCI2032_ConfigDigitalOutput()H Hartley Sweeten1-29/+29
For aesthetic reasons, move this function. This function has nothing to do with the digital outputs. It's used to enable the interrupt sources that the board can generate. 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>
2012-11-29staging: comedi: addi_apci_2032: remove the timer s->range_tableH Hartley Sweeten1-1/+0
The timer subdevice does not have a digital range. Its range of 0 to 0xff is the value used to set the reload timer. Remove the setting of s->range_table. The comedi core will then set it to range_unknown. 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>
2012-11-29staging: comedi: addi_apci_2032: cleanup the subdevice initH Hartley Sweeten1-16/+16
For aesthetic reasons, add some whitespace to the subdevice init. 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>
2012-11-29staging: comedi: addi_apci_2032: fix the watchdog timer subdeviceH Hartley Sweeten1-30/+61
The watchdog timer on this board functions exactly like the one on the apci_1516 board. Fix the i_APCI2032_StartStopWriteWatchdog and i_APCI2032_ConfigWatchdo functions so that the watchdog follows the comedi API. Rename the CamelCase function i_APCI2032_StartStopWriteWatchdog to apci2032_wdog_insn_writ. This function is used to "ping" the watchdog. Rename the CamelCase function i_APCI2032_ConfigWatchdog to apci2032_wdog_insn_config. This function is used to enable/disable the watchdog and set the timeout. 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>
2012-11-29staging: comedi: addi_apci_2032: remove need for addi-data/addi_common.hH Hartley Sweeten1-4/+2
Only the ADDIDATA_ENABLE define is used from this header. Just open-code the value to remove the dependency and remove the include. 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>
2012-11-29staging: comedi: addi_apci_2032: remove use of struct addi_privateH Hartley Sweeten1-26/+5
The only data in addi_private used in this driver is: tsk_Current - used with send_sig to signal userspace when an interrupt has occurred. Interrupt support in this driver does not follow the standard comedi API so this functionality is currently broken. This will be addressed. b_OutputMemoryStatus - used in the addi-data "common" code to enable reading of the eeprom. Eeprom support is not needed by this driver and has been removed. Since this data is not needed, remove the use of struct addi_private. 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>
2012-11-29staging: comedi: addi_apci_2032: fix i_APCI2032_ReadWatchdog()H Hartley Sweeten1-3/+7
This function is used by the watchdog subdevice to read the status of the watchdog. Rename the CamelCase function to apci2032_wdog_insn_read and fix the function to return the status value insn->n times like the comedi core expects. 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>
2012-11-29staging: comedi: addi_apci_2032: cleanup register map definesH Hartley Sweeten1-79/+57
Cleanup the defines a bit and add the missing information for the bits in the registers. 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>
2012-11-29staging: comedi: addi_apci_2032: merge in hwdrv_apci2032.cH Hartley Sweeten2-365/+215
Merge the code from hwdrv_apci2032.c into the driver and delete the now unused file. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-29staging: comedi: addi_apci_2032: cleanup the s->subdev_flagsH Hartley Sweeten1-3/+2
The flags SDF_GROUND and SDF_COMMON only have meaning for analog input/output subdevices. Remove these flags from the digital output and timer subdevices in this driver. The digital output subdevice does not need the SDF_READABLE flag. 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>
2012-11-29staging: comedi: addi_apci_2032: remove boardinfoH Hartley Sweeten1-81/+20
This driver only supports a single board type. Remove the boardinfo and just use the information directly where used. 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>
2012-11-29staging: comedi: addi_apci_2032: only allocate needed subdevicesH Hartley Sweeten1-26/+5
The addi-data "common" code always allocated 7 subdevices. This driver only requires 2. Change the allocation and remove the unused subdevices. 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>
2012-11-29staging: comedi: addi_apci_2032: remove use of devpriv->s_EeParametersH Hartley Sweeten1-23/+5
This driver no longer reads the eeprom to find the board specific data, all the necessary data is in the boardinfo. Use the boardinfo directly instead of passing through devpriv->s_EeParameters. 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>
2012-11-29staging: comedi: addi_apci_2032: don't read the unused PCI barsH Hartley Sweeten1-4/+0
This driver only uses PCI bar 1 (dev->iobase), doon't bother reading the unused PCI bars. 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>
2012-11-29staging: comedi: addi_apci_2032: remove devpriv->iobase usageH Hartley Sweeten2-25/+17
The iobase address stored in devpriv->iobase is also stored in dev->iobase. Use that instead. 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>
2012-11-29staging: comedi: addi_apci_2032: remove unnecessary info from boardinfoH Hartley Sweeten1-4/+0
The i_IorangeBase[012], i_PCIEeprom, and pc_EepromChip data in the boardinfo was only needed to work out the usage of the PCI bars. This is no longer needed so remove the data. 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>
2012-11-29staging: comedi: addi_apci_2032: simplify the PCI bar readingH Hartley Sweeten1-20/+4
The board supported by this driver has a 93c76 eeprom. Knowing this information allows simplifying the code that reads the PCI bars to get the iobase address. Also, since the 'dw_AiBase' is not ioremap'ed we can remove the iounmap 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>
2012-11-29staging: comedi: addi_apci_2032: absorb i_APCI2032_Reset()H Hartley Sweeten2-35/+11
This is the only 'reset' function used by the driver, remove it from the boardinfo and absorb the code from hwdrv_apci2032.c into the driver. Rename the CamelCase function i_ADDI_Reset() to apci2032_reset(). 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>
2012-11-29staging: comedi: addi_apci_2032: remove unnecessary includeH Hartley Sweeten1-1/+0
This include is no longer needed. 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>
2012-11-29staging: comedi: addi_apci_2032: remove eeprom support codeH Hartley Sweeten1-45/+1
Reading the eeprom on the board supported by this driver is not necessary. All the information required is in the boardinfo. Remove the eeprom support code since it's not really interesting or useful. 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>
2012-11-29staging: comedi: addi_apci_2032: board does not have analog inputsH Hartley Sweeten1-33/+1
The board supported by this driver does not have analog inputs. Remove the subdevice init for 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>
2012-11-29staging: comedi: addi_apci_2032: board does not have analog outputsH Hartley Sweeten1-13/+2
The board supported by this driver does not have analog outputs. Remove the subdevice init for 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>
2012-11-29staging: comedi: addi_apci_2032: board does not have digital inputsH Hartley Sweeten1-16/+2
The board supported by this driver does not have digital inputs. Remove the subdevice init for 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>
2012-11-29staging: comedi: addi_apci_2032: board does not have ttl i/oH Hartley Sweeten1-20/+1
The board supported by this driver does not have ttl i/o. Remove the subdevice init for 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>
2012-11-29staging: comedi: addi_apci_2032: separate from addi_common.cH Hartley Sweeten1-3/+311
This driver is for a simple 32 channel digital output board. Using the addi-data "common" code introduces a lot of bloat. Copy the code in addi_common.c to this driver and remove the #include that caused addi_common.c to be compiled with this driver. This will allow removing the bloat. Rename the attach_pci and detach functions so they have namespace associated with this driver. 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>
2012-11-28kill daemonize()Al Viro1-3/+1
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
2012-11-28staging: r8712u: Fix possible buffer overrunLarry Finger1-1/+1
In routine r8712_report_sec_ie(), the code could set the length of the buffer to 256; however, that value is one larger than the corresponding memory allocation. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-28staging: gdm72xx: use %pI4 format to print IPv4 address and remove last ↵Shan Wei1-12/+1
usage of NIP6 commit cf4ca4874fc45 removed the definition of NIPQUAD and NIPQUAD_FMT, and NIP6 also is out of date. commit 2874762b31d8d replace deprecated NIPQUAD marco to C code, but we can use %pI4 to print IPv4 address more simply. And remove constant condition judge. Because DEBUG_SDU is not defined in gdm_wimax.h, no error message when compiling. Signed-off-by: Shan Wei <davidshan@tencent.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-28staging/fwserial: Remove superfluous freePeter Hurley1-1/+0
Now that the dma fifo is allocated on activate and freed on shutdown, this extra free is harmless but unnecessary. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-28staging/fwserial: Use WARN_ONCE when port table is corruptedPeter Hurley1-8/+3
Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-28staging/fwserial: Destruct embedded tty_port on teardownPeter Hurley1-1/+4
For TTY drivers that manage the port lifetime, the tty_port should to be specifically destructed when the port lifetime ends. Now that a method has been added to do this, use it. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Cc: Jiri Slaby <jslaby@suse.cz> Cc: Alan Cox <alan@linux.intel.com>
2012-11-28staging/fwserial: Fix build breakage when !CONFIG_BUGPeter Hurley1-4/+1
Use WARN() as intended. Reported-by: Randy Dunlap <rdunlap@infradead.org> Acked-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-28staging: fwserial: Add TTY-over-Firewire serial driverPeter Hurley9-0/+3824
This patch provides the kernel driver for high-speed TTY communication over the IEEE 1394 bus. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Acked-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-28staging/rtl8187se: Fix spacing coding style in ieee80211/ieee80211_rx.cYAMANE Toshiaki1-17/+17
The following warnings fixed. - WARNING: please, no spaces at the start of a line - WARNING: please, no space before tabs Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-28staging/rtl8187se: Fix spacing coding style in ieee80211/ieee80211_rx.cYAMANE Toshiaki1-27/+20
The following warnings fixed. - WARNING: braces {} are not necessary for single statement blocks Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-28staging/rtl8187se: Use netdev_ printks in ieee80211/ieee80211_rx.cYAMANE Toshiaki1-12/+11
The following warnings fixed. - WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then pr_debug(... to printk(KERN_DEBUG ... - WARNING: Prefer netdev_warn(netdev, ... then dev_warn(dev, ... then pr_warn(... to printk(KERN_WARNING ... - WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ... Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-28staging/rtl8187se: Fix spacing coding style in ieee80211/ieee80211_rx.cYAMANE Toshiaki1-4/+4
The following errors fixed. - ERROR: "foo* bar" should be "foo *bar" Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>