From bc8075c62c552b7b8f82e4fcd1fad3edee4e90c7 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Tue, 4 May 2010 14:42:57 +0100 Subject: [PATCH] --- yaml --- r: 197215 b: refs/heads/master c: ff7723e203349c18d7149e7cf2a4ae928bb9da69 h: refs/heads/master i: 197213: 33a75d952c4981fe6c60f19c12f5f2038f8d8e6b 197211: 90f1cef45cbde8eaf9cde2d921390f8e82377c6c 197207: deb466fb58d6151b64d324055833fbf16283d954 197199: fb93e2f15a4a7ef2d1f4f564da056127f3671f66 197183: 6d387a1d4d8e862ec62465ccd68e5a57470ea31a v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/sysfs.h | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7acacf4fa288..fee13d277ad0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad313b1062f0e16e5fa64e1a34eec37e1b8a3341 +refs/heads/master: ff7723e203349c18d7149e7cf2a4ae928bb9da69 diff --git a/trunk/drivers/staging/iio/sysfs.h b/trunk/drivers/staging/iio/sysfs.h index d8fe0e276036..afcf5ab85f48 100644 --- a/trunk/drivers/staging/iio/sysfs.h +++ b/trunk/drivers/staging/iio/sysfs.h @@ -144,18 +144,25 @@ struct iio_const_attr { * * May be mode dependent on some devices **/ +/* Deprecated */ #define IIO_DEV_ATTR_AVAIL_SAMP_FREQ(_show) \ IIO_DEVICE_ATTR(available_sampling_frequency, S_IRUGO, _show, NULL, 0) +#define IIO_DEV_ATTR_SAMP_FREQ_AVAIL(_show) \ + IIO_DEVICE_ATTR(sampling_frequency_available, S_IRUGO, _show, NULL, 0) /** * IIO_CONST_ATTR_AVAIL_SAMP_FREQ - list available sampling frequencies * @_string: frequency string for the attribute * * Constant version **/ -#define IIO_CONST_ATTR_AVAIL_SAMP_FREQ(_string) \ +/* Deprecated */ +#define IIO_CONST_ATTR_AVAIL_SAMP_FREQ(_string) \ IIO_CONST_ATTR(available_sampling_frequency, _string) +#define IIO_CONST_ATTR_SAMP_FREQ_AVAIL(_string) \ + IIO_CONST_ATTR(sampling_frequency_available, _string) + /** * IIO_DEV_ATTR_SCAN_MODE - select a scan mode * @_mode: sysfs file mode/permissions @@ -234,6 +241,9 @@ struct iio_const_attr { #define IIO_DEV_ATTR_TEMP(_show) \ IIO_DEVICE_ATTR(temp, S_IRUGO, _show, NULL, 0) +#define IIO_DEV_ATTR_TEMP_RAW(_show) \ + IIO_DEVICE_ATTR(temp_raw, S_IRUGO, _show, NULL, 0) + /** * IIO_EVENT_SH - generic shared event handler * @_name: event name