diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2010-07-11 16:39:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 11:38:29 -0700 |
| commit | 69584bd6d257e008fe4eeebd95c318201dc71d83 (patch) | |
| tree | a1a0935301cccb6f4023e3f42404e18d6e2af806 /drivers/staging/iio/ring_generic.h | |
| parent | 2662051e0868d1bde0abeea19bd54c3c18941afc (diff) | |
| download | op-kernel-dev-69584bd6d257e008fe4eeebd95c318201dc71d83.zip op-kernel-dev-69584bd6d257e008fe4eeebd95c318201dc71d83.tar.gz | |
staging: iio: Fix scan_element naming issue
The addition of a number to the scan_element names caused
an issue in drivers that used either #define or an enum
to provide the number. Before this fix names like
ADIS16350_ACCEL_X_accel_x_en occur rather than 5_accel_x_en.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
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 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h index dbf11e1..524a0b3 100644 --- a/drivers/staging/iio/ring_generic.h +++ b/drivers/staging/iio/ring_generic.h @@ -215,7 +215,7 @@ ssize_t iio_scan_el_ts_show(struct device *dev, struct device_attribute *attr, * @_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, _bits, _label, _controlfunc) \ struct iio_scan_el iio_scan_el_##_name = { \ .dev_attr = __ATTR(_number##_##_name##_en, \ S_IRUGO | S_IWUSR, \ @@ -227,7 +227,10 @@ ssize_t iio_scan_el_ts_show(struct device *dev, struct device_attribute *attr, .set_state = _controlfunc, \ } -#define IIO_SCAN_NAMED_EL_C(_name, _string, _number, _bits, _label, _cf) \ +#define IIO_SCAN_EL_C(_name, _number, _bits, _label, _controlfunc) \ + __IIO_SCAN_EL_C(_name, _number, _bits, _label, _controlfunc) + +#define __IIO_SCAN_NAMED_EL_C(_name, _string, _number, _bits, _label, _cf) \ struct iio_scan_el iio_scan_el_##_name = { \ .dev_attr = __ATTR(_number##_##_string##_en, \ S_IRUGO | S_IWUSR, \ @@ -238,7 +241,8 @@ ssize_t iio_scan_el_ts_show(struct device *dev, struct device_attribute *attr, .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) /** * IIO_SCAN_EL_TIMESTAMP - declare a special scan element for timestamps * |
