diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2011-05-18 14:42:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-19 16:14:57 -0700 |
| commit | 1caf7cb461351b33d6229692a17afcad238e5b7a (patch) | |
| tree | 6832617e4313beacd13dbae1f3c2aacbc247d250 /drivers/staging/iio/adc/ad7606.h | |
| parent | 29b7f43ef41bdbdd35dc54ea878efb855c224b7b (diff) | |
staging:iio:adc:ad7606 Convert to new channel registration method Update Add missing call to iio_trigger_notify_done() Set pollfunc top and bottom half handler
V3: rebase fixup.
Backported to relevant merge point by Jonathan Cameron.
V2: IIO_CHAN macro usage update
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/adc/ad7606.h')
| -rw-r--r-- | drivers/staging/iio/adc/ad7606.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/iio/adc/ad7606.h b/drivers/staging/iio/adc/ad7606.h index c90009040b7..364d89a5a44 100644 --- a/drivers/staging/iio/adc/ad7606.h +++ b/drivers/staging/iio/adc/ad7606.h @@ -43,10 +43,9 @@ struct ad7606_platform_data { /** * struct ad7606_chip_info - chip specifc information * @name: indentification string for chip - * @bits: accuracy of the adc in bits - * @bits: output coding [s]igned or [u]nsigned * @int_vref_mv: the internal reference voltage - * @num_channels: number of physical inputs on chip + * @channels: channel specification + * @num_channels: number of channels */ struct ad7606_chip_info { @@ -54,6 +53,7 @@ struct ad7606_chip_info { u8 bits; char sign; u16 int_vref_mv; + struct iio_chan_spec *channels; unsigned num_channels; }; @@ -69,7 +69,6 @@ struct ad7606_state { struct regulator *reg; struct work_struct poll_work; wait_queue_head_t wq_data_avail; - atomic_t protect_ring; size_t d_size; const struct ad7606_bus_ops *bops; int irq; |