summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'staging-3.8-rc1' of ↵Linus Torvalds2012-12-11768-81798/+31519
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging driver tree merge from Greg Kroah-Hartman: "Here's the big staging tree merge for 3.8-rc1 There's a lot of patches in here, the majority being the comedi rework/cleanup that has been ongoing and is causing a huge reduction in overall code size, which is amazing to watch. We also removed some older drivers (telephony and rts_pstor), and added a new one (fwserial which also came in through the tty tree due to tty api changes, take that one if you get merge conflicts.) The iio and ipack drivers are moving out of the staging area into their own part of the kernel as they have been cleaned up sufficiently and are working well. Overall, again a reduction of code: 768 files changed, 31887 insertions(+), 82166 deletions(-) All of this has been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'staging-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1298 commits) iio: imu: adis16480: remove duplicated include from adis16480.c iio: gyro: adis16136: remove duplicated include from adis16136.c iio:imu: adis16480: show_firmware() buffer too small iio:gyro: adis16136: divide by zero in write_frequency() iio: adc: Add Texas Instruments ADC081C021/027 support iio:ad7793: Add support for the ad7796 and ad7797 iio:ad7793: Add support for the ad7798 and ad7799 staging:iio: Move ad7793 driver out of staging staging:iio:ad7793: Implement stricter id checking staging:iio:ad7793: Move register definitions from header to source staging:iio:ad7793: Rework regulator handling staging:iio:ad7793: Rework platform data staging:iio:ad7793: Use kstrtol instead of strict_strtol staging:iio:ad7793: Use usleep_range instead of msleep staging:iio:ad7793: Fix temperature scale staging:iio:ad7793: Fix VDD monitor scale staging: gdm72xx: unlock on error in init_usb() staging: panel: pass correct lengths to keypad_send_key() staging: comedi: addi_apci_2032: fix interrupt support staging: comedi: addi_apci_2032: move i_APCI2032_ConfigDigitalOutput() ...
| * Merge tag 'iio-for-3.8f' of ↵Greg Kroah-Hartman2012-11-3010-171/+649
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next Jonathan writes: "6th set of IIO new driver support, clean up and fixes for the 3.8 cycle (possibly wait until 3.9 cycle given timing). Here we have * the cleanup and move out of staging of ad7793. * addition support for additional parts to ad7793. * a basic new driver for TI ADC081C021/027 * 4 little fixes for the recent addition of ad16136 and ad16480. So some nice work with nothing controversial or anything that will effect stuff outside the drivers in question."
| | * iio: imu: adis16480: remove duplicated include from adis16480.cWei Yongjun2012-11-301-1/+0
| | | | | | | | | | | | | | | | | | | | | Remove duplicated include. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| | * iio: gyro: adis16136: remove duplicated include from adis16136.cWei Yongjun2012-11-301-1/+0
| | | | | | | | | | | | | | | | | | | | | Remove duplicated include. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| | * iio:imu: adis16480: show_firmware() buffer too smallDan Carpenter2012-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Smatch complains that snprintf() returns the number of characters, not counting the NUL terminator, which *would* have been printed if there were enough space. In other words the return value could be more than sizeof(buf). In this case, we are printing something like "ff.ff\n" which is at most 6 characters and a NUL so that's not an issue. I changed snprintf() to scnprintf() to silence the warning. But since the buffer doesn't include space for the NUL terminator, we need to make it bigger or the "\n" will be truncated off. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-By: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| | * iio:gyro: adis16136: divide by zero in write_frequency()Dan Carpenter2012-11-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's slightly cleaner to use kstrtouint() because we pass unsigned ints to adis16136_set_freq(). On 64 bit systems, if the user passed LONG_MIN then it we would get past the test against zero but crash in adis16136_set_freq() because we truncate the high bits away. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-By: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| | * iio: adc: Add Texas Instruments ADC081C021/027 supportThierry Reding2012-11-303-0/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for reading conversion results from the ADC and provide them through a single IIO channel. A proper scaling factor is also exported based on the reference voltage provided by a regulator. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Reviewed-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| | * iio:ad7793: Add support for the ad7796 and ad7797Lars-Peter Clausen2012-11-301-12/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ad7796 and ad7797 are similar to the ad7792 and ad7793 but only have a single differential input instead of two. Also some other features are missing like the programmable gain amplifier and also not all sampling frequencies supported by the ad7792/ad7793 are supported by the ad7796/ad7797. This patch adds new feature flags for the features not present in the ad7796/ad7797. The patch also adds a struct iio_info field to the chip_info struct, this becomes necessary since the ad7796/ad7797 needs a special set of sysfs attributes. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| | * iio:ad7793: Add support for the ad7798 and ad7799Lars-Peter Clausen2012-11-301-14/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ad7798 and ad7799 are similar to the ad7792 and ad7793 but are missing some features like the temperature sensor, being able to use an external clocksource and a few other things. This patch adds a new 'flags' fields to the chip_info struct which allows to specify which features a certain chip variant supports. The setup code will then ignore any platform data fields which are related to non supported features. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| | * staging:iio: Move ad7793 driver out of stagingLars-Peter Clausen2012-11-306-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | The driver does not expose any custom API to userspace and none of the standard static code checker tools report any issues, so move it out of staging. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| | * staging:iio:ad7793: Implement stricter id checkingLars-Peter Clausen2012-11-301-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>
| | * staging:iio:ad7793: Move register definitions from header to sourceLars-Peter Clausen2012-11-302-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>
| | * staging:iio:ad7793: Rework regulator handlingLars-Peter Clausen2012-11-302-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>
| | * staging:iio:ad7793: Rework platform dataLars-Peter Clausen2012-11-302-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>
| | * staging:iio:ad7793: Use kstrtol instead of strict_strtolLars-Peter Clausen2012-11-301-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>
| | * staging:iio:ad7793: Use usleep_range instead of msleepLars-Peter Clausen2012-11-301-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>
| | * staging:iio:ad7793: Fix temperature scaleLars-Peter Clausen2012-11-301-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>
| | * staging:iio:ad7793: Fix VDD monitor scaleLars-Peter Clausen2012-11-301-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>
| * staging: gdm72xx: unlock on error in init_usb()Dan Carpenter2012-11-291-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>
| * staging: panel: pass correct lengths to keypad_send_key()Dan Carpenter2012-11-291-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>
| * staging: comedi: addi_apci_2032: fix interrupt supportH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: move i_APCI2032_ConfigDigitalOutput()H Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: remove the timer s->range_tableH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: cleanup the subdevice initH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: fix the watchdog timer subdeviceH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: remove need for addi-data/addi_common.hH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: remove use of struct addi_privateH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: fix i_APCI2032_ReadWatchdog()H Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: cleanup register map definesH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: merge in hwdrv_apci2032.cH Hartley Sweeten2012-11-292-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>
| * staging: comedi: addi_apci_2032: cleanup the s->subdev_flagsH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: remove boardinfoH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: only allocate needed subdevicesH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: remove use of devpriv->s_EeParametersH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: don't read the unused PCI barsH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: remove devpriv->iobase usageH Hartley Sweeten2012-11-292-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>
| * staging: comedi: addi_apci_2032: remove unnecessary info from boardinfoH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: simplify the PCI bar readingH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: absorb i_APCI2032_Reset()H Hartley Sweeten2012-11-292-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>
| * staging: comedi: addi_apci_2032: remove unnecessary includeH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: remove eeprom support codeH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: board does not have analog inputsH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: board does not have analog outputsH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: board does not have digital inputsH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: board does not have ttl i/oH Hartley Sweeten2012-11-291-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>
| * staging: comedi: addi_apci_2032: separate from addi_common.cH Hartley Sweeten2012-11-291-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>
| * staging: r8712u: Fix possible buffer overrunLarry Finger2012-11-281-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>
| * staging: gdm72xx: use %pI4 format to print IPv4 address and remove last ↵Shan Wei2012-11-281-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>
| * staging/rtl8187se: Fix spacing coding style in ieee80211/ieee80211_rx.cYAMANE Toshiaki2012-11-281-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>
| * staging/rtl8187se: Fix spacing coding style in ieee80211/ieee80211_rx.cYAMANE Toshiaki2012-11-281-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>
OpenPOWER on IntegriCloud