summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-02Staging: bcm: Change BOOLEAN to bool in InterfaceAdapter.hKevin McKinney
This patch changes BOOLEAN to bool in InterfaceAdapter.h. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02Staging: bcm: Change PVOID to void * in InterfaceAdapter.hKevin McKinney
This patch changes PVOID to void * in InterfaceAdapter.h. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02Staging: bcm: Change UINT to unsigned int in InterfaceAdapter.hKevin McKinney
This patch changes UINT to unsigned int in InterfaceAdapter.h. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02Staging: bcm: Change UCHAR to unsigned char in InterfaceAdapter.hKevin McKinney
This patch changes UCHAR to unsigned char in InterfaceAdapter.h. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02Staging: bcm: Change PCHAR to char * in InterfaceAdapter.hKevin McKinney
This patch changes PCHAR to char * in InterfaceAdapter.h. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02Staging: bcm: Correctly format braces in InterfaceAdapter.hKevin McKinney
This patch correctly formats braces in InterfaceAdapter.h as reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02Staging: bcm: Correctly format comments in InterfaceAdapter.hKevin McKinney
This patch correctly formats comments in InterfaceAdapter.h as reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02Staging: bcm: Fix all white space issues in InterfaceAdapter.hKevin McKinney
This patch fixes all white space issues in InterfaceAdapter.h as reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02staging/comedi: Use dev_ printks in ni_tiocmd.cYAMANE Toshiaki
fixed below checkpatch warnings. - WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ... - WARNING: Prefer netdev_info(netdev, ... then dev_info(dev, ... then pr_info(... to printk(KERN_INFO ... - WARNING: Prefer netdev_notice(netdev, ... then dev_notice(dev, ... then pr_notice(... to printk(KERN_NOTICE ... Signed-off-by: YAMANE Toshiaki <yamanetoshi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02staging: wlan-ng: hfa384x_usb.c: fixed a coding style issueKumar Amit Mehta
checkpatch.pl throws error message for the current code. This patch fixes coding style issue. Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02staging: et131x: Align ring_index and fbr[] indiciesMark Einon
A ring_index value of 0 is being used to reference the free buffer ring fbr[1] and ring_index=1 is used to reference fbr[0]. Avoid this confusing referencing by swapping the indicies so that ring_index=0 refers to fbr[0] and vice versa. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02staging: et131x: Remove unused buffer[1,2] variables.Mark Einon
The fbr_lookup struct variables buffer1 and buffer2 are only assigned and never used, so remove them. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-02staging: comedi: addi_apci_3120: cleanup addi_find_boardinfo()H Hartley Sweeten
This driver uses the comedi PCI auto attach mechanism and the comedi core does not use the boardinfo during the attach. Now that this driver has the attach separated from addi_common.c we can remove passing the boardinfo in the comedi_driver and cleanup the code that finds the boardinfo. Also, rename addi_find_boardinfo() so it has 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-02staging: comedi: addi_apci_3120: remove COMEDI_SUBD_TTLIO defineH Hartley Sweeten
This define 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>
2012-11-02staging: comedi: addi_apci_3120: cleanup apci3120_detach()H Hartley Sweeten
This driver always tried to allocate the dma buffers so they need to be free'd when the board is detached. Remove the unneeded tests for the eeprom chip and bring the code back an indent. 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-02staging: comedi: addi_apci_3120: clarify AO subdevice initH Hartley Sweeten
Only the apci3120 board supports an analog output subdevice. The boardinfo indicates this by setting the 'i_NbrAoChannel' value. The range table as well as the function used for the insn_write operation are fixed for the analog outputs. Remove this information from the boardinfo and use it directly in 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-02staging: comedi: addi_apci_3120: remove 'b_AvailableConvertUnit'H Hartley Sweeten
This boardinfo value 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>
2012-11-02staging: comedi: addi_apci_3120: remove 'ui_MinDelaytimeNs'H Hartley Sweeten
Both boards supported by this driver have the same minimum delay time. Remove the boardinfo for it and just open code the value in i_APCI3120_CommandTestAnalogInput(). 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-02staging: comedi: addi_apci_3120: remove 'ui_MinAcquisitiontimeNs'H Hartley Sweeten
Both boards supported by this driver have the same minimum acquisition time.. Remove the boardinfo for it and just open code the value in i_APCI3120_CommandTestAnalogInput(). 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-02staging: comedi: addi_apci_3120: remove 'pr_AiRangelist'H Hartley Sweeten
Both boards supported by this driver have the same analog input ranges. Remove the boardinfo for it and just init the subdevice directly. 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-02staging: comedi: addi_apci_3120: remove the 'i_IorangeBase*'H Hartley Sweeten
These values in the boardinfor were used in the common addi-data attach code to work out use of the PCI bars. Since this driver has a localized attach we already know the use of the bars so this information in the boardinfo is unnecessary. 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-02staging: comedi: addi_apci_3120: fix the number of subdevicesH Hartley Sweeten
The addi-data "common" code always allocates 7 subdevices. This driver is now separate from that code so we can 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-02staging: comedi: addi_apci_3120: remove i_ADDI_Reset()H Hartley Sweeten
This driver is now separate from the "common" code used with the addi-data drivers. There is no need to use i_ADDI_Reset() to call the correct "reset" function. Remove the i_ADDI_Reset() function and the 'reset' pointer to the real function from the boardinfo and just call the function directly where 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-02staging: comedi: addi_apci_3120: clarify AI subdevice initH Hartley Sweeten
The two boards supported by this driver use the same functions for the comedi operations. Remove this data from the boardinfo to clarify 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-02The two boards supported by this driver use the same functions forH Hartley Sweeten
the comedi operations. Remove this data from the boardinfo to clarify 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-02staging: comedi: addi_apci_3120: clarify DO subdevice initH Hartley Sweeten
The two boards supported by this driver use the same functions for the comedi operations. Remove this data from the boardinfo to clarify 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-02staging: comedi: addi_apci_3120: clarify timer subdevice initH Hartley Sweeten
The two boards supported by this driver use the same functions for the comedi operations. Remove this data from the boardinfo to clarify 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-02staging: comedi: addi_apci_3120: remove test for AI subdeviceH Hartley Sweeten
The boards supported by this driver all have analog inputs. Remove the test 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-02staging: comedi: addi_apci_3120: remove test for DI subdeviceH Hartley Sweeten
The boards supported by this driver all have digital inputs. Remove the test 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-02staging: comedi: addi_apci_3120: remove test for DO subdeviceH Hartley Sweeten
The boards supported by this driver all have digital outputs. Remove the test 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-02staging: comedi: addi_apci_3120: remove test for timer supportH Hartley Sweeten
The boards supported by this driver support a timer subdevice. Remove the tests 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-02staging: comedi: addi_apci_3120: remove test for dma supportH Hartley Sweeten
The boards supported by this driver support dma. Remove the tests 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-02staging: comedi: addi_apci_3120: remove need for s_EeParametersH Hartley Sweeten
The boards supported by this driver do not have an eeprom. Remove the need for the devpriv->s_EeParameters values by just using the values from the boardinfo directly. 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-02staging: comedi: addi_apci_3120: board does not have ttl i/oH Hartley Sweeten
The boards supported by this driver do not have ttl i/o. Remove the unnecessary code to initialize the subdevice. 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-02staging: comedi: addi_apci_3120: remove eeprom handling codeH Hartley Sweeten
The boards supported by this driver do not have an eeprom. Remove the unnecessary code to handle 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-02staging: comedi: addi_common: remove dma setup/free codeH Hartley Sweeten
None of the addi-data drivers that use the "common" code in addi_common.c support dma. Remove the code that sets up the dma and allocates the buffers in the attach and the code that frees the buffers 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-02staging: comedi: addi_apci_3120: separate from addi_common.cH Hartley Sweeten
The addi_apci_3120 driver is the only addi-data driver that supports dma. 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 special handling for allocating and freeing the dma buffers in the common code. 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-02staging: comedi: addi_apci_3120: remove CONFIG_APCI_3120 defineH Hartley Sweeten
Now that the apci3001 and apci3120 boards are merged we can remove this unnecessary define. 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-02staging: comedi: addi_apci_3120: merge in addi_apci_3001 driverH Hartley Sweeten
The addi_apci_3120 and addi_apci_3001 drivers share the same low-level board support code (hwdrv_apci3120). Merge the boardinfo and PCI_DEVICE information from the addi_apci_3001 driver into the addi_apci_3120 driver and delete then delete the addi_apci_3001 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-02Merge tag 'iio-for-3.8b' of ↵Greg Kroah-Hartman
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next Second round of new IIO drivers and cleanups for the 3.8 cycle. Usual mixed bag of cleanups and minor improvements including one reversion for a patch in the previous series. * adt7310 and adt7410 drivers merged into one. * Revert use devm_kcalloc in at91_adc (because it doesn't exist) * unlocking fix for error path in the ad5449 * isl29018 suspend and resume support. * improved pseudo floating point parsing for info_mask write attributes (and hence into write_raw). Reject some messed up strings.
2012-11-02iio: isl29018: Support suspend and resume.Bryan Freed
The driver leaves the device in power-down state anyway, so there is nothing to do on suspend. On resume, we just have to make sure the range and ADC values are updated in the device since it may have been powered down in suspend. Signed-off-by: Bryan Freed <bfreed@chromium.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-02iio: Accept a leading '+' sign when parsing fixed point numbersLars-Peter Clausen
If we encounter a leading '+' sign just skip over it. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-02iio: Reject trailing garbage when parsing fixed point numbersLars-Peter Clausen
When parsing a fixed point number IIO stops parsing the string once it has reached the last requested decimal place. This means that the remainder of the string is silently accepted regardless, of whether it is part of a valid number or not. This patch modifies the code to scan the whole string and only accept valid numbers. Since fract_mult is 0 after the last decimal place any digit that may follows won't affect the result. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-02iio: Do not accept multiple '.' in fixed point numbersLars-Peter Clausen
Currently when parsing a fix-point number we silently skip any additional '.' found in the string. E.g. '1.2.3.4' gets parsed as '1.234'. This patch disallows this and returns an error if more than one '.' is encountered. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-02staging: iio: adc: ad7280a.c: fixed macro coding styleKumar Amit Mehta
remove unnecessary semicolon from the macro definition Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
2012-11-01staging: comedi: jr3_pci: CodingStyle fixesIan Abbott
Follow coding style for whitespace, operator placement, use of braces, etc. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-01staging: comedi: jr3_pci: update driver description commentIan Abbott
Reformat the comment used to describe the Comedi driver to use the usual block comment style. Update the information reflecting the fact that the driver no longer supports manual attachment of devices via the `COMEDI_DEVCONFIG` ioctl and `attach()` method. Also, in the instructions indicating where to put the firmware file, mention the expected name of the file since the driver requests the firmware file by name. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-01staging: comedi: jr3_pci: remove noisy printkIan Abbott
This driver seems to generate a lot of printk output every time the driver polls the device. This may have been useful during development but shouldn't be used in production. Just get rid of it all. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-01staging: comedi: jr3_pci: remove devpriv->pci_enabledIan Abbott
The `pci_enabled` member of `struct jr3_pci_dev_private` is used to indicate whether the call to `comedi_pci_enable()` was successful. The 'detach' routine `jr3_pci_detach()` uses this to decide whether to call `comedi_pci_disable()`. The `iobase` member of `struct comedi_device` is not used by this driver so it can be used for the same purpose. Remove the `pci_enabled` member and use the spare `dev->iobase` instead. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-11-01staging: comedi: jr3_pci: remove devpriv->pci_devIan Abbott
The `pci_dev` member of `struct jr3_pci_dev_private` is used to point to the `struct pci_dev`. This is redundant as the `struct comedi_device` already has a pointer to the `struct device` within the `struct pci_dev` and there is a convenient inline function, `comedi_to_pci_dev(dev)` that returns a pointer to the `struct pci_dev`. Remove the redundant `pci_dev` member and use alternate ways to get at the `struct pci_dev`. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>