diff options
author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-09-21 14:40:56 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-21 10:34:41 -0700 |
commit | 44f270de711dcaf595786f2318b36f9b4f007338 (patch) | |
tree | b3d90fa6838e01f36d34ca982d445c2642f70686 /drivers/staging/iio/ring_generic.h | |
parent | 5df2145c8c37af0cc7c10009eea86c493cc434a5 (diff) | |
download | op-kernel-dev-44f270de711dcaf595786f2318b36f9b4f007338.zip op-kernel-dev-44f270de711dcaf595786f2318b36f9b4f007338.tar.gz |
staging: iio: Remove unused bit_count from struct iio_scan_el
The job this was intended to do (never implemented) is now done
by explicit definition of _type attributes in all drivers
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/iio/ring_generic.h')
-rw-r--r-- | drivers/staging/iio/ring_generic.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h index 692b967..6be399a 100644 --- a/drivers/staging/iio/ring_generic.h +++ b/drivers/staging/iio/ring_generic.h @@ -168,7 +168,6 @@ static inline void __iio_update_ring_buffer(struct iio_ring_buffer *ring, * struct iio_scan_el - an individual element of a scan * @dev_attr: control attribute (if directly controllable) * @number: unique identifier of element (used for bit mask) - * @bit_count: number of bits in scan element * @label: useful data for the scan el (often reg address) * @set_state: for some devices datardy signals are generated * for any enabled lines. This allows unwanted lines @@ -177,7 +176,6 @@ static inline void __iio_update_ring_buffer(struct iio_ring_buffer *ring, struct iio_scan_el { struct device_attribute dev_attr; unsigned int number; - int bit_count; unsigned int label; int (*set_state)(struct iio_scan_el *scanel, @@ -232,39 +230,36 @@ ssize_t iio_scan_el_ts_show(struct device *dev, struct device_attribute *attr, * @_name: identifying name. Resulting struct is iio_scan_el_##_name, * sysfs element, _name##_en. * @_number: unique id number for the scan element. - * @_bits: number of bits in the scan element result (used in mixed bit * length devices). * @_label: indentification variable used by drivers. Often a reg address. * @_controlfunc: function used to notify hardware of whether state changes **/ -#define __IIO_SCAN_EL_C(_name, _number, _bits, _label, _controlfunc) \ +#define __IIO_SCAN_EL_C(_name, _number, _label, _controlfunc) \ struct iio_scan_el iio_scan_el_##_name = { \ .dev_attr = __ATTR(_number##_##_name##_en, \ S_IRUGO | S_IWUSR, \ iio_scan_el_show, \ iio_scan_el_store), \ .number = _number, \ - .bit_count = _bits, \ .label = _label, \ .set_state = _controlfunc, \ } -#define IIO_SCAN_EL_C(_name, _number, _bits, _label, _controlfunc) \ - __IIO_SCAN_EL_C(_name, _number, _bits, _label, _controlfunc) +#define IIO_SCAN_EL_C(_name, _number, _label, _controlfunc) \ + __IIO_SCAN_EL_C(_name, _number, _label, _controlfunc) -#define __IIO_SCAN_NAMED_EL_C(_name, _string, _number, _bits, _label, _cf) \ +#define __IIO_SCAN_NAMED_EL_C(_name, _string, _number, _label, _cf) \ struct iio_scan_el iio_scan_el_##_name = { \ .dev_attr = __ATTR(_number##_##_string##_en, \ S_IRUGO | S_IWUSR, \ iio_scan_el_show, \ iio_scan_el_store), \ .number = _number, \ - .bit_count = _bits, \ .label = _label, \ .set_state = _cf, \ } -#define IIO_SCAN_NAMED_EL_C(_name, _string, _number, _bits, _label, _cf) \ - __IIO_SCAN_NAMED_EL_C(_name, _string, _number, _bits, _label, _cf) +#define IIO_SCAN_NAMED_EL_C(_name, _string, _number, _label, _cf) \ + __IIO_SCAN_NAMED_EL_C(_name, _string, _number, _label, _cf) /** * IIO_SCAN_EL_TIMESTAMP - declare a special scan element for timestamps * @number: specify where in the scan order this is stored. |