profile/ivi/kernel-x86-ivi.git
11 years agoiio:adc:max1363 move from staging.
Jonathan Cameron [Sat, 6 Oct 2012 13:42:27 +0000 (14:42 +0100)]
iio:adc:max1363 move from staging.

Now this driver is using kfifo we can move it out of staging.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:adc:max1363 cleanup regulator handling.
Jonathan Cameron [Sat, 6 Oct 2012 13:39:19 +0000 (14:39 +0100)]
staging:iio:adc:max1363 cleanup regulator handling.

For historical reasons the regulator handling was a little clunky. This
patch brings it inline with a more standard ordering wrt to allocation
of the iio_device.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:adc:max1363 white space cleanup
Jonathan Cameron [Sat, 6 Oct 2012 13:38:11 +0000 (14:38 +0100)]
staging:iio:adc:max1363 white space cleanup

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:adc:max1363 make docs match the contents of max1363_chip_info
Jonathan Cameron [Sat, 6 Oct 2012 13:37:44 +0000 (14:37 +0100)]
staging:iio:adc:max1363 make docs match the contents of max1363_chip_info

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:adc:max1363 drop references to 'ring' given now using a fifo
Jonathan Cameron [Sat, 6 Oct 2012 13:19:01 +0000 (14:19 +0100)]
staging:iio:adc:max1363 drop references to 'ring' given now using a fifo

Seems worth clearing the old naming out to avoid any confusion in the future.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:adc:max1363 consolidate files.
Jonathan Cameron [Sat, 6 Oct 2012 13:10:05 +0000 (14:10 +0100)]
staging:iio:adc:max1363 consolidate files.

For a long while now the max1363 core has selected the
buffer anyway. For a while I meant to make the separation
work again, but given how long it has been it is probably
time to conclude it will never happen and settle for tidying
up what we have.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:adc:max1363 ring_sw->kfifo conversion
Jonathan Cameron [Sat, 19 May 2012 14:27:51 +0000 (15:27 +0100)]
staging:iio:adc:max1363 ring_sw->kfifo conversion

We are moving towards scrapping ring_sw so this move
is necessary.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio: add a callback buffer for in kernel push interface
Jonathan Cameron [Sat, 30 Jun 2012 19:06:00 +0000 (20:06 +0100)]
staging:iio: add a callback buffer for in kernel push interface

This callback buffer is meant to be opaque to users, but basically
adds a very simple pass through buffer to which data may be
pushed when it is inserted into the buffer list.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:in kernel users: Add a data field for channel specific info.
Jonathan Cameron [Sat, 30 Jun 2012 19:06:00 +0000 (20:06 +0100)]
staging:iio:in kernel users: Add a data field for channel specific info.

Used to allow information about a given channel mapping to be passed
through from board files to the consumer drivers.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio: Add support for multiple buffers
Jonathan Cameron [Sat, 30 Jun 2012 19:06:00 +0000 (20:06 +0100)]
staging:iio: Add support for multiple buffers

Route all buffer writes through the demux.
Addition or removal of a buffer results in tear down and
setup of all the buffers for a given device.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Tested-by: srinivas pandruvada <srinivas.pandruvada@intel.com>
11 years agostaging:iio: Move the ad7887 driver out of staging
Lars-Peter Clausen [Mon, 5 Nov 2012 09:56:00 +0000 (09:56 +0000)]
staging:iio: Move the ad7887 driver out of staging

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>
11 years agostaging:iio:ad7887: Use passed in chan spec in ad7887_read_raw
Lars-Peter Clausen [Mon, 5 Nov 2012 09:56:00 +0000 (09:56 +0000)]
staging:iio:ad7887: Use passed in chan spec in ad7887_read_raw

Use the passed in chan spec in ad7887_read_raw instead of alawys using the first
chan spec entry from the chip info data. Since all channels have the same shift
and realbits from a functional point of view it does not matter which chan spec
is used, but the patch makes the a bit more clear.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:ad7887: Allow to use internal ref in two channel mode
Lars-Peter Clausen [Mon, 5 Nov 2012 09:56:00 +0000 (09:56 +0000)]
staging:iio:ad7887: Allow to use internal ref in two channel mode

While it is not recommended to use the internal reference in two channel mode in
order to obtain optimal performance it is still possible to use it.

While we are at it also get rid of the duplicate tx_cmd_buf entries. There are
only two unique entries. One for channel 1 and one for channel 2.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:ad7887: Use proper kernel doc
Lars-Peter Clausen [Mon, 5 Nov 2012 09:56:00 +0000 (09:56 +0000)]
staging:iio:ad7887: Use proper kernel doc

Use proper kernel doc to document the platform data struct.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:ad7887: Squash everything into one file
Lars-Peter Clausen [Mon, 5 Nov 2012 09:56:00 +0000 (09:56 +0000)]
staging:iio:ad7887: Squash everything into one file

The recent cleanups have decimated the drivers code size by quite a bit. It is
only a few hundred lines in total now and we also always build buffer support,
so there really is no need to spread the driver out over multiple files. Putting
everything into one file also allows to reduce the code size a bit more by
removing a few lines of boilerplate code.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:ad7887: Rework regulator handling
Lars-Peter Clausen [Mon, 5 Nov 2012 09:56:00 +0000 (09:56 +0000)]
staging:iio:ad7887: Rework regulator handling

Rework the regulator handling of the ad7887 driver to match more closely what we
do for other drivers. Only request the regulator if a external reference is
used, but treat it as an error if requesting the regulator fails. Also remove
the possibility to specify the reference voltage via platform data and always
use the regulator for this.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
11 years agostaging:iio:ad7887: Preallocate sample buffer
Lars-Peter Clausen [Mon, 5 Nov 2012 09:56:00 +0000 (09:56 +0000)]
staging:iio:ad7887: Preallocate sample buffer

We know that the sample buffer will at most need to hold two 16 bit samples and
the 64 bit aligned 64 bit timestamp. Preallocate a buffer large enough to hold
this instead of allocating and freeing it each time a sample is read.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
12 years agostaging:iio:adis16400: Set the PROD_ID flag for the adis16334
Lars-Peter Clausen [Tue, 30 Oct 2012 10:26:00 +0000 (10:26 +0000)]
staging:iio:adis16400: Set the PROD_ID flag for the adis16334

The adis16334 has the PROD_ID register so set the PROD_ID flag in its chip info.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
12 years agostaging:iio:adis16400: Remove now duplicated chip_table entry
Lars-Peter Clausen [Tue, 30 Oct 2012 10:26:00 +0000 (10:26 +0000)]
staging:iio:adis16400: Remove now duplicated chip_table entry

The ADIS1360 and ADIS13605 are very similar and do have the same software
interface. The only difference is the contents of the PROD_ID register. Since we
now read the product id from the device name instead of the chip_info struct we
can use the same chip_table entry for both the ADIS1360 and ADIS13605.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
12 years agostaging:iio:adis16400: Fix product id check
Lars-Peter Clausen [Tue, 30 Oct 2012 10:26:00 +0000 (10:26 +0000)]
staging:iio:adis16400: Fix product id check

The product id check currently ANDs the read id with 0xF000 and compares the
result to the product id from the chip info. Since none of the product ids in
the chip info table end in 0x000 the check will always fail. Furthermore it is
also wrong, the product id in the PROD_ID register will always match the part
number of the device.

Some of the ADIS16XXX devices are identical from a software point of
view with the product id register having a different content. If we keep the
current scheme of storing the product id in the chip info table this would
require us to have multiple almost identical chip info table entries. So instead
this patch changes the code to parse the product id from the device name.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
12 years agostaging:iio:adis16400: Fix adis16334 sampling frequency control
Lars-Peter Clausen [Tue, 30 Oct 2012 10:26:00 +0000 (10:26 +0000)]
staging:iio:adis16400: Fix adis16334 sampling frequency control

Setting the sampling frequency for the adis16334 differs from the other devices.
This patch introduces two new callback functions to the adis16400 chip_info
struct which are used to specify how to read and write the current sample rate.
The patch also introduces the proper implementations for these callbacks for the
adis16334.

Related to this is that the adis16334 has no slow mode and so we do not limit
the SPI clock rate to 300kHz during initialization. The patch adds a new flag
for devices which do have a slow mode.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
12 years agostaging: comedi: adl_pci9118: support auto-attachment
Ian Abbott [Fri, 2 Nov 2012 13:52:32 +0000 (13:52 +0000)]
staging: comedi: adl_pci9118: support auto-attachment

Support auto-attachment of supported PCI devices by adding the
`auto_attach()` hook (`pci9118_auto_attach()`) to the `struct
comedi_driver`.  This is called via `comedi_pci_auto_attach()` at PCI
probe time.

Previously, the driver's call to `comedi_pci_auto_config()` would fall
back to the old method of auto-attaching devices and would fail because
it couldn't find a board name matching the driver name.  The new method
doesn't care about that.

There are still a few problems.  All the boards supported by this driver
have the same PCI vendor and device ID, so it will just pick the first
supported board type, "pci9118dg".  (Other supported board types have
different AI ranges or different AI speeds, but are otherwise the same.)
Also, manual attachment of devices allows several optional features to
be configured, such as use of an external multiplexord, specified
sample&hold delays and options to ignore certain hardware errors.  These
will all be set to defaults for auto-attached devices.  A future version
of the driver may address these issues via configurable device
attributes.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: adl_pci9118: cards have same vendor ID
Ian Abbott [Fri, 2 Nov 2012 13:52:31 +0000 (13:52 +0000)]
staging: comedi: adl_pci9118: cards have same vendor ID

Don't bother recording the PCI vendor ID of each board in `boardtypes[]`
as they are all the same and the code doesn't use it anyway.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: adl_pci9118: split pci9118_attach()
Ian Abbott [Fri, 2 Nov 2012 13:52:30 +0000 (13:52 +0000)]
staging: comedi: adl_pci9118: split pci9118_attach()

Split most of the functionality of the attach routine `pci9118_attach()`
into a new function `pci9118_common_attach()` that can be called when
auto-attachment of devices is supported.  Move the enabling of the PCI
device and its i/o regions into this function.  Do the requesting of the
interrupt near the end of the function so it doesn't get enabled before
the device is ready.

Note that auto-attachment of PCI devices is currently broken in this
driver because the list of board names referred to by the `struct
comedi_driver` does not contain a "wildcard" entry matching the comedi
driver name.  This won't be a problem once support for the
`auto_attach()` method is added.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: adl_pci9118: replace printks
Ian Abbott [Fri, 2 Nov 2012 13:52:29 +0000 (13:52 +0000)]
staging: comedi: adl_pci9118: replace printks

Replace or remove the `printk()` calls in this driver.  Call new function
`pci9118_report_attach()` to report successful attachment of the board.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: Change ULONG to unsigned long in InterfaceAdapter.h
Kevin McKinney [Fri, 2 Nov 2012 03:42:28 +0000 (23:42 -0400)]
Staging: bcm: Change ULONG to unsigned long in InterfaceAdapter.h

This patch changes ULONG to unsigned long
in InterfaceAdapter.h.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: Remove typedef for _BULK_ENDP_IN and call directly.
Kevin McKinney [Fri, 2 Nov 2012 03:42:27 +0000 (23:42 -0400)]
Staging: bcm: Remove typedef for _BULK_ENDP_IN and call directly.

This patch removes typedef for
_BULK_ENDP_IN, changes the name of the
struct to bcm_bulk_endpoint_in. In addition,
any calls to typedefs BULK_ENDP_IN, or
*PBULK_ENDP_IN are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: Remove typedef for _BULK_ENDP_OUT and call directly.
Kevin McKinney [Fri, 2 Nov 2012 03:42:26 +0000 (23:42 -0400)]
Staging: bcm: Remove typedef for _BULK_ENDP_OUT and call directly.

This patch removes typedef for
_BULK_ENDP_OUT, changes the name of the
struct to bcm_bulk_endpoint_out. In addition,
any calls to typedefs BULK_ENDP_OUT, or
*PBULK_ENDP_OUT are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: Remove typedef for _INTR_ENDP_IN and call directly.
Kevin McKinney [Fri, 2 Nov 2012 03:42:25 +0000 (23:42 -0400)]
Staging: bcm: Remove typedef for _INTR_ENDP_IN and call directly.

This patch removes typedef for
_INTR_ENDP_IN, changes the name of the
struct to bcm_intr_endpoint_in. In addition,
any calls to typedefs INTR_ENDP_IN, or
*PINTR_ENDP_IN are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: Remove typedef for _INTR_ENDP_OUT and call directly.
Kevin McKinney [Fri, 2 Nov 2012 03:42:24 +0000 (23:42 -0400)]
Staging: bcm: Remove typedef for _INTR_ENDP_OUT and call directly.

This patch removes typedef for
_INTR_ENDP_OUT, changes the name of the
struct to bcm_intr_endpoint_out. In addition,
any calls to typedefs INTR_ENDP_OUT, or
*PINTR_ENDP_OUT are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: Remove typedef for _USB_TCB and call directly.
Kevin McKinney [Fri, 2 Nov 2012 03:42:23 +0000 (23:42 -0400)]
Staging: bcm: Remove typedef for _USB_TCB and call directly.

This patch removes typedef for
_USB_TCB, changes the name of the
struct to bcm_usb_tcb. In addition,
any calls to typedefs USB_TCB, or
*PUSB_TCB are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: Remove typedef for _USB_RCB and call directly.
Kevin McKinney [Fri, 2 Nov 2012 03:42:22 +0000 (23:42 -0400)]
Staging: bcm: Remove typedef for _USB_RCB and call directly.

This patch removes typedef for
_USB_RCB, changes the name of the
struct to bcm_usb_rcb. In addition,
any calls to typedefs USB_RCB, or
*PUSB_RCB are changed to call the
struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: Remove typedef for _S_INTERFACE_ADAPTER and call directly.
Kevin McKinney [Fri, 2 Nov 2012 03:42:21 +0000 (23:42 -0400)]
Staging: bcm: Remove typedef for _S_INTERFACE_ADAPTER and call directly.

This patch removes typedef for
_S_INTERFACE_ADAPTER, changes the
name of the struct to bcm_interface_adapter.
In addition, any calls to typedefs
S_INTERFACE_ADAPTER, or *PS_INTERFACE_ADAPTER
are changed to call the struct directly.

Signed-off-by: Kevin McKinney <klmckinney1@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agoStaging: bcm: Change BOOLEAN to bool in InterfaceAdapter.h
Kevin McKinney [Fri, 2 Nov 2012 03:42:20 +0000 (23:42 -0400)]
Staging: bcm: Change BOOLEAN to bool in InterfaceAdapter.h

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>
12 years agoStaging: bcm: Change PVOID to void * in InterfaceAdapter.h
Kevin McKinney [Fri, 2 Nov 2012 03:42:19 +0000 (23:42 -0400)]
Staging: bcm: Change PVOID to void * in InterfaceAdapter.h

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>
12 years agoStaging: bcm: Change UINT to unsigned int in InterfaceAdapter.h
Kevin McKinney [Fri, 2 Nov 2012 03:42:18 +0000 (23:42 -0400)]
Staging: bcm: Change UINT to unsigned int in InterfaceAdapter.h

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>
12 years agoStaging: bcm: Change UCHAR to unsigned char in InterfaceAdapter.h
Kevin McKinney [Fri, 2 Nov 2012 03:42:17 +0000 (23:42 -0400)]
Staging: bcm: Change UCHAR to unsigned char in InterfaceAdapter.h

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>
12 years agoStaging: bcm: Change PCHAR to char * in InterfaceAdapter.h
Kevin McKinney [Fri, 2 Nov 2012 03:42:16 +0000 (23:42 -0400)]
Staging: bcm: Change PCHAR to char * in InterfaceAdapter.h

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>
12 years agoStaging: bcm: Correctly format braces in InterfaceAdapter.h
Kevin McKinney [Fri, 2 Nov 2012 03:42:15 +0000 (23:42 -0400)]
Staging: bcm: Correctly format braces in InterfaceAdapter.h

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>
12 years agoStaging: bcm: Correctly format comments in InterfaceAdapter.h
Kevin McKinney [Fri, 2 Nov 2012 03:42:14 +0000 (23:42 -0400)]
Staging: bcm: Correctly format comments in InterfaceAdapter.h

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>
12 years agoStaging: bcm: Fix all white space issues in InterfaceAdapter.h
Kevin McKinney [Fri, 2 Nov 2012 03:42:13 +0000 (23:42 -0400)]
Staging: bcm: Fix all white space issues in InterfaceAdapter.h

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>
12 years agostaging/comedi: Use dev_ printks in ni_tiocmd.c
YAMANE Toshiaki [Fri, 2 Nov 2012 04:55:48 +0000 (13:55 +0900)]
staging/comedi: Use dev_ printks in ni_tiocmd.c

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>
12 years agostaging: wlan-ng: hfa384x_usb.c: fixed a coding style issue
Kumar Amit Mehta [Fri, 2 Nov 2012 09:19:45 +0000 (02:19 -0700)]
staging: wlan-ng: hfa384x_usb.c: fixed a coding style issue

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>
12 years agostaging: et131x: Align ring_index and fbr[] indicies
Mark Einon [Thu, 1 Nov 2012 22:56:43 +0000 (22:56 +0000)]
staging: et131x: Align ring_index and fbr[] indicies

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>
12 years agostaging: et131x: Remove unused buffer[1,2] variables.
Mark Einon [Thu, 1 Nov 2012 22:56:42 +0000 (22:56 +0000)]
staging: et131x: Remove unused buffer[1,2] variables.

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>
12 years agostaging: comedi: addi_apci_3120: cleanup addi_find_boardinfo()
H Hartley Sweeten [Fri, 2 Nov 2012 00:31:10 +0000 (17:31 -0700)]
staging: comedi: addi_apci_3120: cleanup addi_find_boardinfo()

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>
12 years agostaging: comedi: addi_apci_3120: remove COMEDI_SUBD_TTLIO define
H Hartley Sweeten [Fri, 2 Nov 2012 00:30:53 +0000 (17:30 -0700)]
staging: comedi: addi_apci_3120: remove COMEDI_SUBD_TTLIO define

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>
12 years agostaging: comedi: addi_apci_3120: cleanup apci3120_detach()
H Hartley Sweeten [Fri, 2 Nov 2012 00:30:37 +0000 (17:30 -0700)]
staging: comedi: addi_apci_3120: cleanup apci3120_detach()

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>
12 years agostaging: comedi: addi_apci_3120: clarify AO subdevice init
H Hartley Sweeten [Fri, 2 Nov 2012 00:30:17 +0000 (17:30 -0700)]
staging: comedi: addi_apci_3120: clarify AO subdevice init

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>
12 years agostaging: comedi: addi_apci_3120: remove 'b_AvailableConvertUnit'
H Hartley Sweeten [Fri, 2 Nov 2012 00:30:02 +0000 (17:30 -0700)]
staging: comedi: addi_apci_3120: remove 'b_AvailableConvertUnit'

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>
12 years agostaging: comedi: addi_apci_3120: remove 'ui_MinDelaytimeNs'
H Hartley Sweeten [Fri, 2 Nov 2012 00:29:46 +0000 (17:29 -0700)]
staging: comedi: addi_apci_3120: remove 'ui_MinDelaytimeNs'

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>
12 years agostaging: comedi: addi_apci_3120: remove 'ui_MinAcquisitiontimeNs'
H Hartley Sweeten [Fri, 2 Nov 2012 00:29:30 +0000 (17:29 -0700)]
staging: comedi: addi_apci_3120: remove 'ui_MinAcquisitiontimeNs'

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>
12 years agostaging: comedi: addi_apci_3120: remove 'pr_AiRangelist'
H Hartley Sweeten [Fri, 2 Nov 2012 00:29:13 +0000 (17:29 -0700)]
staging: comedi: addi_apci_3120: remove 'pr_AiRangelist'

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>
12 years agostaging: comedi: addi_apci_3120: remove the 'i_IorangeBase*'
H Hartley Sweeten [Fri, 2 Nov 2012 00:28:57 +0000 (17:28 -0700)]
staging: comedi: addi_apci_3120: remove the 'i_IorangeBase*'

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>
12 years agostaging: comedi: addi_apci_3120: fix the number of subdevices
H Hartley Sweeten [Fri, 2 Nov 2012 00:28:41 +0000 (17:28 -0700)]
staging: comedi: addi_apci_3120: fix the number of subdevices

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>
12 years agostaging: comedi: addi_apci_3120: remove i_ADDI_Reset()
H Hartley Sweeten [Fri, 2 Nov 2012 00:28:24 +0000 (17:28 -0700)]
staging: comedi: addi_apci_3120: remove i_ADDI_Reset()

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>
12 years agostaging: comedi: addi_apci_3120: clarify AI subdevice init
H Hartley Sweeten [Fri, 2 Nov 2012 00:28:11 +0000 (17:28 -0700)]
staging: comedi: addi_apci_3120: clarify AI subdevice init

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>
12 years agoThe two boards supported by this driver use the same functions for
H Hartley Sweeten [Fri, 2 Nov 2012 00:27:47 +0000 (17:27 -0700)]
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>
12 years agostaging: comedi: addi_apci_3120: clarify DO subdevice init
H Hartley Sweeten [Fri, 2 Nov 2012 00:27:33 +0000 (17:27 -0700)]
staging: comedi: addi_apci_3120: clarify DO subdevice init

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>
12 years agostaging: comedi: addi_apci_3120: clarify timer subdevice init
H Hartley Sweeten [Fri, 2 Nov 2012 00:27:18 +0000 (17:27 -0700)]
staging: comedi: addi_apci_3120: clarify timer subdevice init

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>
12 years agostaging: comedi: addi_apci_3120: remove test for AI subdevice
H Hartley Sweeten [Fri, 2 Nov 2012 00:27:03 +0000 (17:27 -0700)]
staging: comedi: addi_apci_3120: remove test for AI subdevice

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>
12 years agostaging: comedi: addi_apci_3120: remove test for DI subdevice
H Hartley Sweeten [Fri, 2 Nov 2012 00:26:45 +0000 (17:26 -0700)]
staging: comedi: addi_apci_3120: remove test for DI subdevice

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>
12 years agostaging: comedi: addi_apci_3120: remove test for DO subdevice
H Hartley Sweeten [Fri, 2 Nov 2012 00:26:31 +0000 (17:26 -0700)]
staging: comedi: addi_apci_3120: remove test for DO subdevice

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>
12 years agostaging: comedi: addi_apci_3120: remove test for timer support
H Hartley Sweeten [Fri, 2 Nov 2012 00:26:16 +0000 (17:26 -0700)]
staging: comedi: addi_apci_3120: remove test for timer support

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>
12 years agostaging: comedi: addi_apci_3120: remove test for dma support
H Hartley Sweeten [Fri, 2 Nov 2012 00:26:00 +0000 (17:26 -0700)]
staging: comedi: addi_apci_3120: remove test for dma support

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>
12 years agostaging: comedi: addi_apci_3120: remove need for s_EeParameters
H Hartley Sweeten [Fri, 2 Nov 2012 00:25:44 +0000 (17:25 -0700)]
staging: comedi: addi_apci_3120: remove need for s_EeParameters

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>
12 years agostaging: comedi: addi_apci_3120: board does not have ttl i/o
H Hartley Sweeten [Fri, 2 Nov 2012 00:25:27 +0000 (17:25 -0700)]
staging: comedi: addi_apci_3120: board does not have ttl i/o

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>
12 years agostaging: comedi: addi_apci_3120: remove eeprom handling code
H Hartley Sweeten [Fri, 2 Nov 2012 00:25:11 +0000 (17:25 -0700)]
staging: comedi: addi_apci_3120: remove eeprom handling code

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>
12 years agostaging: comedi: addi_common: remove dma setup/free code
H Hartley Sweeten [Fri, 2 Nov 2012 00:24:55 +0000 (17:24 -0700)]
staging: comedi: addi_common: remove dma setup/free code

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>
12 years agostaging: comedi: addi_apci_3120: separate from addi_common.c
H Hartley Sweeten [Fri, 2 Nov 2012 00:24:38 +0000 (17:24 -0700)]
staging: comedi: addi_apci_3120: separate from addi_common.c

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>
12 years agostaging: comedi: addi_apci_3120: remove CONFIG_APCI_3120 define
H Hartley Sweeten [Fri, 2 Nov 2012 00:24:22 +0000 (17:24 -0700)]
staging: comedi: addi_apci_3120: remove CONFIG_APCI_3120 define

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>
12 years agostaging: comedi: addi_apci_3120: merge in addi_apci_3001 driver
H Hartley Sweeten [Fri, 2 Nov 2012 00:24:06 +0000 (17:24 -0700)]
staging: comedi: addi_apci_3120: merge in addi_apci_3001 driver

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>
12 years agoMerge tag 'iio-for-3.8b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...
Greg Kroah-Hartman [Fri, 2 Nov 2012 16:27:30 +0000 (09:27 -0700)]
Merge tag 'iio-for-3.8b' of git://git./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.

12 years agoiio: isl29018: Support suspend and resume.
Bryan Freed [Wed, 24 Oct 2012 23:39:00 +0000 (00:39 +0100)]
iio: isl29018: Support suspend and resume.

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>
12 years agoiio: Accept a leading '+' sign when parsing fixed point numbers
Lars-Peter Clausen [Mon, 22 Oct 2012 11:15:00 +0000 (12:15 +0100)]
iio: Accept a leading '+' sign when parsing fixed point numbers

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>
12 years agoiio: Reject trailing garbage when parsing fixed point numbers
Lars-Peter Clausen [Mon, 22 Oct 2012 11:15:00 +0000 (12:15 +0100)]
iio: Reject trailing garbage when parsing fixed point numbers

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>
12 years agoiio: Do not accept multiple '.' in fixed point numbers
Lars-Peter Clausen [Mon, 22 Oct 2012 11:15:00 +0000 (12:15 +0100)]
iio: Do not accept multiple '.' in fixed point numbers

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>
12 years agostaging: iio: adc: ad7280a.c: fixed macro coding style
Kumar Amit Mehta [Fri, 2 Nov 2012 07:28:00 +0000 (07:28 +0000)]
staging: iio: adc: ad7280a.c: fixed macro coding style

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>
12 years agostaging: comedi: jr3_pci: CodingStyle fixes
Ian Abbott [Thu, 1 Nov 2012 18:34:41 +0000 (18:34 +0000)]
staging: comedi: jr3_pci: CodingStyle fixes

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>
12 years agostaging: comedi: jr3_pci: update driver description comment
Ian Abbott [Thu, 1 Nov 2012 18:34:40 +0000 (18:34 +0000)]
staging: comedi: jr3_pci: update driver description comment

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>
12 years agostaging: comedi: jr3_pci: remove noisy printk
Ian Abbott [Thu, 1 Nov 2012 18:34:39 +0000 (18:34 +0000)]
staging: comedi: jr3_pci: remove noisy printk

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>
12 years agostaging: comedi: jr3_pci: remove devpriv->pci_enabled
Ian Abbott [Thu, 1 Nov 2012 18:34:38 +0000 (18:34 +0000)]
staging: comedi: jr3_pci: remove devpriv->pci_enabled

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>
12 years agostaging: comedi: jr3_pci: remove devpriv->pci_dev
Ian Abbott [Thu, 1 Nov 2012 18:34:37 +0000 (18:34 +0000)]
staging: comedi: jr3_pci: remove devpriv->pci_dev

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>
12 years agostaging: comedi: jr3_pci: rename card variable
Ian Abbott [Thu, 1 Nov 2012 18:34:36 +0000 (18:34 +0000)]
staging: comedi: jr3_pci: rename card variable

The local variable `card` in `jr3_pci_auto_attach()` is used to point to
the PCI device `struct pci_dev`.  Rename it to `pcidev`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: jr3_pci: use auto_attach method
Ian Abbott [Thu, 1 Nov 2012 18:34:35 +0000 (18:34 +0000)]
staging: comedi: jr3_pci: use auto_attach method

This driver does not need to support manual attachment of supported PCI
devices.  Replace the `attach()` hook (`jr3_pci_attach()`) with an
`auto_attach()` hook (`jr3_pci_auto_attach()`).  This will be called via
`comedi_pci_auto_config()` at PCI probe time.

This driver no longer increments the PCI reference count during
attachment, so remove the call to `pci_dev_put()` when detaching the
device.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: addi_apci_1710: add the missing MODULE_* information
H Hartley Sweeten [Thu, 1 Nov 2012 18:11:14 +0000 (11:11 -0700)]
staging: comedi: addi_apci_1710: add the missing MODULE_* information

This driver is missing the MODULE_* information. Add the standard
comedi info.

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>
12 years agostaging: comedi: addi_apci_1710: remove COMEDI_SUBD_TTLIO define
H Hartley Sweeten [Thu, 1 Nov 2012 18:10:51 +0000 (11:10 -0700)]
staging: comedi: addi_apci_1710: remove COMEDI_SUBD_TTLIO define

This define exists in hwdrv_APCI1710.c, where it's actually used.
Remove the duplicate 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>
12 years agostaging: comedi: addi_apci_1710: remove the 'i_IorangeBase*'
H Hartley Sweeten [Thu, 1 Nov 2012 18:10:35 +0000 (11:10 -0700)]
staging: comedi: addi_apci_1710: remove the 'i_IorangeBase*'

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>
12 years agostaging: comedi: addi_apci_1710: remove the eeprom parameters
H Hartley Sweeten [Thu, 1 Nov 2012 18:10:19 +0000 (11:10 -0700)]
staging: comedi: addi_apci_1710: remove the eeprom parameters

This driver does not have an eeprom and does not use the data
saved in devpriv->s_EeParameters. Remove the code that initalizes
the eeprom parameters.

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>
12 years agostaging: comedi: addi_apci_1710: remove dma setup/free code
H Hartley Sweeten [Thu, 1 Nov 2012 18:10:02 +0000 (11:10 -0700)]
staging: comedi: addi_apci_1710: remove dma setup/free code

This driver does not use 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>
12 years agostaging: comedi: addi_apci_1710: remove eeprom handling code
H Hartley Sweeten [Thu, 1 Nov 2012 18:09:43 +0000 (11:09 -0700)]
staging: comedi: addi_apci_1710: remove eeprom handling code

The apci1710 board does 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>
12 years agostaging: comedi: addi_apci_1710: remove i_ADDI_Reset
H Hartley Sweeten [Thu, 1 Nov 2012 18:09:27 +0000 (11:09 -0700)]
staging: comedi: addi_apci_1710: remove i_ADDI_Reset

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>
12 years agostaging: comedi: addi_apci_1710: cleanup addi_find_boardinfo()
H Hartley Sweeten [Thu, 1 Nov 2012 18:09:12 +0000 (11:09 -0700)]
staging: comedi: addi_apci_1710: cleanup addi_find_boardinfo()

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>
12 years agostaging: comedi: addi-data: remove special handling for apci1710
H Hartley Sweeten [Thu, 1 Nov 2012 18:08:56 +0000 (11:08 -0700)]
staging: comedi: addi-data: remove special handling for apci1710

Now that the addi_apci_1710 driver is not using addi_common.c we can
remove the CONFIG_APCI_1710 define and all the special handling for
the initialization of it's subdevices.

Also remove the i_ADDIDATA_InsnReadEeprom() function from the
addi_apci_1710 driver. This board does not have an eeprom subdevice
and does not use this function.

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>
12 years agostaging: comedi: addi_apci_1710: separate from addi_common.c
H Hartley Sweeten [Thu, 1 Nov 2012 18:08:37 +0000 (11:08 -0700)]
staging: comedi: addi_apci_1710: separate from addi_common.c

This addi-data driver uses a private function to initialize all
the subdevices during the attach of the board.

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 the apci1710 board 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>
12 years agostaging: comedi: gsc_hpdi: update driver description comment
Ian Abbott [Thu, 1 Nov 2012 16:28:34 +0000 (16:28 +0000)]
staging: comedi: gsc_hpdi: update driver description comment

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.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: gsc_hpdi: change DEBUG_PRINT()
Ian Abbott [Thu, 1 Nov 2012 16:28:33 +0000 (16:28 +0000)]
staging: comedi: gsc_hpdi: change DEBUG_PRINT()

Change the `DEBUG_PRINT(format, args...)` macro used by this module to
use either `pr_debug()` (if macro `HPDI_DEBUG` is defined) or
`no_printk()` instead of `printk()` or nothing.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: gsc_hpdi: use board name to request resources
Ian Abbott [Thu, 1 Nov 2012 16:28:32 +0000 (16:28 +0000)]
staging: comedi: gsc_hpdi: use board name to request resources

When requesting PCI region resources and IRQ, use the board name as the
resource owner string instead of the driver name.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: gsc_hpdi: make board name pointer const
Ian Abbott [Thu, 1 Nov 2012 16:28:31 +0000 (16:28 +0000)]
staging: comedi: gsc_hpdi: make board name pointer const

Change the type of the `name` member of `struct hpdi_board` from `char
*` to `const char *` as it should not be modifiable.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
12 years agostaging: comedi: gsc_hpdi: remove board(dev) function
Ian Abbott [Thu, 1 Nov 2012 16:28:30 +0000 (16:28 +0000)]
staging: comedi: gsc_hpdi: remove board(dev) function

The `board(dev)` function just casts `dev->board_ptr` to a pointer to
the private data type `struct hpdi_private` and returns it.  It's only
called from one function: `hpdi_auto_attach()`.

Remove `board()` and use a local variable to point to the `struct
hpdi_private` data structure.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>