summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'staging-next' of ↵Linus Torvalds2011-10-26725-180469/+103925
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits) staging: et131x: Remove redundant check and return statement staging: et131x: Mainly whitespace changes to appease checkpatch staging: et131x: Remove last of the forward declarations staging: et131x: Remove even more forward declarations staging: et131x: Remove yet more forward declarations staging: et131x: Remove more forward declarations staging: et131x: Remove forward declaration of et131x_adapter_setup staging: et131x: Remove some forward declarations staging: et131x: Remove unused rx_ring.recv_packet_pool staging: et131x: Remove call to find pci pm capability staging: et131x: Remove redundant et131x_reset_recv() call staging: et131x: Remove unused rx_ring.recv_buffer_pool Staging: bcm: Fix three initialization errors in InterfaceDld.c Staging: bcm: Fix coding style issues in InterfaceDld.c staging:iio:dac: Add AD5360 driver staging:iio:trigger:bfin-timer: Fix compile error Staging: vt6655: add some range checks before memcpy() Staging: vt6655: whitespace fixes to iotcl.c Staging: vt6656: add some range checks before memcpy() Staging: vt6656: whitespace cleanups in ioctl.c ... Fix up conflicts in: - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}: vg driver movement - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}: driver removal vs now stale changes - drivers/staging/rtl8192e/r8192E_core.c: driver removal vs now stale changes - drivers/staging/et131x/et131*: driver consolidation into one file, tried to do fixups
| * Merge branch 'staging-next' into Linux 3.1Greg Kroah-Hartman2011-10-25834-230470/+103926
| |\ | | | | | | | | | | | | | | | | | | | | | | | | This was done to resolve a conflict in the drivers/staging/comedi/drivers/ni_labpc.c file that resolved a build bugfix in Linus's tree with a "better" bugfix that was in the staging-next tree that resolved the issue in a more complete manner. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove redundant check and return statementMark Einon2011-10-231-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In nic_send_packet(), by the time 'frag' is checked to be zero, it never is - the for loop has been entered (as nr_frags is always > 0) and frag has been incremented at least once. Remove the check and associated error return. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Mainly whitespace changes to appease checkpatchMark Einon2011-10-231-35/+46
| | | | | | | | | | | | | | | | | | | | | | | | - Whitespace changes to appease checkpatch warnings - Removed unneeded braces around single line if/else Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove last of the forward declarationsMark Einon2011-10-231-134/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved functions in et131x.c file to remove the forward declarations of: et131x_rx_dma_disable et131x_rx_dma_enable et131x_init_send et131x_tx_dma_enable Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove even more forward declarationsMark Einon2011-10-231-202/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved functions in et131x.c file to remove the forward declarations of: et1310_in_phy_coma et1310_phy_access_mii_bit et131x_phy_mii_read et131x_mii_write et131x_rx_dma_memory_free Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove yet more forward declarationsMark Einon2011-10-231-220/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved functions in et131x.c file to remove the forward declarations of: et1310_setup_device_for_multicast et1310_setup_device_for_unicast et131x_up et131x_down et131x_enable_txrx et131x_disable_txrx Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove more forward declarationsMark Einon2011-10-231-254/+251
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved functions in et131x.c file to remove the following forward declarations: et131x_soft_reset et131x_isr_handler et131x_device_alloc Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove forward declaration of et131x_adapter_setupMark Einon2011-10-231-223/+222
| | | | | | | | | | | | | | | | | | | | | Also associated function movements within et131x.c file Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove some forward declarationsMark Einon2011-10-231-66/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved functions in et131x.c file to remove the following forward declarations: et131x_align_allocated_memory et131x_disable_interrupts et131x_enable_interrupts et131x_error_timer_handler Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove unused rx_ring.recv_packet_poolMark Einon2011-10-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | tx_ring.recv_packet_pool is unused, even in the original driver code. Removed. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove call to find pci pm capabilityMark Einon2011-10-231-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | pci_find_capability is called, but not used and is now redundant as power management is handled elsewhere. Removed. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove redundant et131x_reset_recv() callMark Einon2011-10-231-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | This call doesn't do anything useful - only warns on the receive list being empty, so removed it. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove unused rx_ring.recv_buffer_poolMark Einon2011-10-231-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | rx_ring.recv_buffer_pool is unused, even in the original driver code. Remove from stuct, and also remove some comments regarding it. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: bcm: Fix three initialization errors in InterfaceDld.cKevin McKinney2011-10-231-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes three initialization errors. One is an incorrect initialization of a static variable. The other two are incorrect initializations in an if statement. These errors were found by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: bcm: Fix coding style issues in InterfaceDld.cKevin McKinney2011-10-231-213/+161
| | | | | | | | | | | | | | | | | | | | | | | | This patch fixes multiple coding style issues in file, InterfaceDld.c, found by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging:iio:dac: Add AD5360 driverLars-Peter Clausen2011-10-233-0/+593
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the Analog Devices AD5360, AD5361, AD5362, AD5363, AD5370, AD5371, AD5372, AD5373 multi-channel digital-to-analog converters. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging:iio:trigger:bfin-timer: Fix compile errorLars-Peter Clausen2011-10-231-1/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6655: add some range checks before memcpy()Dan Carpenter2011-10-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | There were no range checks in the original code so the user could write past the end of the array. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6655: whitespace fixes to iotcl.cDan Carpenter2011-10-231-596/+491
| | | | | | | | | | | | | | | | | | | | | | | | | | | The indents didn't line up at all in the original code. I also fixed a bunch of other white issues as I went along. I changed the comment style and removed some commented out code. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6656: add some range checks before memcpy()Dan Carpenter2011-10-231-0/+6
| | | | | | | | | | | | | | | | | | | | | We need to verify that we're not writing past the end of the array. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * Staging: vt6656: whitespace cleanups in ioctl.cDan Carpenter2011-10-231-552/+483
| | | | | | | | | | | | | | | | | | | | | | | | | | | The indents on this file didn't line up so it was hard to work with. I changed other white space issues as I came across them. I also deleted or changed some couple comments and the comment style. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Remove unused definesMark Einon2011-10-231-11/+0
| | | | | | | | | | | | | | | | | | | | | Some defines are no longer referenced in the code, so removed them. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Convert rest of pci memory management to dma apiMark Einon2011-10-231-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | Replaced pci map/unmap and set_mask calls with their dma equivalents. Also updated comments to reflect this. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: on transmit, stop the queue if the next packet will failMark Einon2011-10-232-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Currently the tx queue is only stopped when the current packet fails. Check if the next packet will fail, and stop the queue if so. * Removed associated item from TODO list in the README. * Also minor fixup as adapter was being declared as null and immediately set to a value. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Tidy up PCI device table definitionMark Einon2011-10-232-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used the convenience macros DEFINE_PCI_DEVICE_TABLE and PCI_VDEVICE to tidy up the device table definition. Also remove the corresponding TODO item from the README. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Match dma_alloc_ calls with dma_free_ callsMark Einon2011-10-231-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous update was to replace pci_alloc with dma_alloc calls. I missed replacing the corresponding pci_free_ calls with the dma versions. Now done. Thanks to Denis Kirjanov <kirjanov@gmail.com> for pointing this out. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: use dma_alloc... instead of pci_alloc...Mark Einon2011-10-232-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use dma_allocs instead of pci_allocs, so we can use GFP_KERNEL allocations. Also removed this item from the TODO list Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Fix issues when USE_FBR0 is not definedMark Einon2011-10-232-147/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Following on from making rx_ring.fbr use a common structure - reversed the fbr[] array indicies so that index 1 = FBR0 and index 0 = FBR1, which allows USE_FBR0 define to work. * Also fixed up minor issues where indexes into the array were out of bounds in some places. * Removed rx_ring.fbr common stuct TODO item from README Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Make rx_ring.fbr{0,1} share a common structureMark Einon2011-10-231-153/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sharing a common structure by moving common structure items into fbr_lookup. TODO - Currently will not work if USE_FBR0 = 0 as FBR1 uses fbr[1] which is removed in this case Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Moving two extern inline functions to .c fileMark Einon2011-10-232-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | Two helper functions for adding 10bit/12bit umbers with wrapping are defined in the header. Moved them to the driver .c file. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Update TODO list - remove 'put driver into single file'Mark Einon2011-10-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Driver now resides in a single file with a separate header with registers, updated the README TODO list. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: move et1310_tx.h contents into et131x.cMark Einon2011-10-232-151/+86
| | | | | | | | | | | | | | | | | | | | | Move et1310_tx.h contents into et131x.c and delete et1310_tx.h Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: move et1310_rx.h contents into et131x.cMark Einon2011-10-232-244/+180
| | | | | | | | | | | | | | | | | | | | | Move et1310_rx.h contents into et131x.c and delete et1310_rx.h Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: move et131x_defs.h contents into et131x.cMark Einon2011-10-232-130/+64
| | | | | | | | | | | | | | | | | | | | | Move et131x_defs.h contents into et131x.c and delete et131x_defs.h Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: move et131x_adapter.h contents into et131x.cMark Einon2011-10-232-218/+151
| | | | | | | | | | | | | | | | | | | | | Move et131x_adapter.h contents into et131x.c and delete et131x_adapter.h Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: move et1310_phy.h contents into et131x.hMark Einon2011-10-233-291/+227
| | | | | | | | | | | | | | | | | | | | | | | | Move et1310_phy.h register defines into et131x.h and delete et1310_phy.h Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: move et1310_address_map.h contents into et131x.hMark Einon2011-10-236-1442/+1370
| | | | | | | | | | | | | | | | | | | | | | | | Move et1310_address_map.h register defines into et131x.h and delete et1310_address_map.h Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Move non-register defines from et131x.h to et131x.cMark Einon2011-10-232-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | Header file should only have register defines, moved non-register defines to et131x.c Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Move function declarations from et131x.h to et131x.cMark Einon2011-10-232-102/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | The function declarations in et131x.h are no longer used now all functions are in one file. Removed declarations from et131x.h and added any required forward declarations to et131x.c. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging: et131x: Put all .c files into one big fileMark Einon2011-10-2313-5862/+5102
| | | | | | | | | | | | | | | | | | | | | | | | Created one big .c file for the driver, moving the contents of all driver .c files into it. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging:iio:dac:ad5686: Check for negative valuesLars-Peter Clausen2011-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently it is possible to write negative values to the ad5686's raw attribute. This will cause undefined behaviour, so reject negative values. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging:iio:dac:ad5791: Fix scale unitLars-Peter Clausen2011-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Scale is currently reported in volts instead of millivolts. This patch fixes it. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging:iio:dac:ad5791: Convert attributes to new naming specLars-Peter Clausen2011-10-191-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Add the missing "voltage" chan_type to the powerdown attributes. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging:iio:dac:ad5791: Allow asymmetrical reference voltagesLars-Peter Clausen2011-10-192-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ad5791 currently assumes that the negative and positive supply have the same absolute value, which is not necessarily true. This patch introduces a offset attribute which will contain the negative supply voltage scaled according to the iio spec. The raw attribute now accepts values in the range of 0 to max instead of -max/2 to max/2. While we are at it also fix the vref span calculation. Since both positive and negative reference voltages are specificed as absolute values we need to add them and not subtract them to get the reference voltage span. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging:iio:dac:ad5791: Use correct DAC bit-sizeLars-Peter Clausen2011-10-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit c5b99396 ("staging:iio:dac:ad5791 chan spec conversion.") introduced a small bug, using storagebits instead of realbits throughout the driver, which causes the driver to work incorrectly. This patch fixes it. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * iio: cdc: Fix pushed event code - Typo, should be IIO_CAPACITANCE.Michael Hennerich2011-10-191-4/+4
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * iio: adc: Relocate Capacitance to Digital Converters (CDC) into own subdirMichael Hennerich2011-10-1910-27/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes. Fix Kconfig description. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * iio: Spell fix - consistent use of Converter - no functional changesMichael Hennerich2011-10-193-12/+12
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| | * staging:iio:dac: Add AD5064 driverLars-Peter Clausen2011-10-193-0/+474
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the Analog Devices AD6064, AD6064-1, AD6044, AD6024 quad channel digital-to-analog converter devices. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
OpenPOWER on IntegriCloud