lkml.org 
[lkml]   [2017]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] Fixed IIO_DEVICE_ATTR_NAMED API to take name as a string and added "" around names
    Fixed IIO_DEVICE_ATTR_NAMED API to take name as a
    string instead of implicit conversion to string using
    preprocessors. Added double quotes around names in
    existing usage of IIO_DEVICE_ATTR_NAMED.

    Signed-off-by: Himanshi Jain <himshijain.hj@gmail.com>
    ---
    drivers/iio/adc/ad7793.c | 2 +-
    drivers/staging/iio/adc/ad7192.c | 2 +-
    drivers/staging/iio/adc/ad7280a.c | 4 ++--
    include/linux/iio/sysfs.h | 6 +++++-
    include/linux/sysfs.h | 7 +++++++
    5 files changed, 16 insertions(+), 5 deletions(-)

    diff --git a/drivers/iio/adc/ad7793.c b/drivers/iio/adc/ad7793.c
    index e6706a0..d74e324 100644
    --- a/drivers/iio/adc/ad7793.c
    +++ b/drivers/iio/adc/ad7793.c
    @@ -420,7 +420,7 @@ static ssize_t ad7793_show_scale_available(struct device *dev,
    }

    static IIO_DEVICE_ATTR_NAMED(in_m_in_scale_available,
    - in_voltage-voltage_scale_available, S_IRUGO,
    + "in_voltage-voltage_scale_available", S_IRUGO,
    ad7793_show_scale_available, NULL, 0);

    static struct attribute *ad7793_attributes[] = {
    diff --git a/drivers/staging/iio/adc/ad7192.c b/drivers/staging/iio/adc/ad7192.c
    index d11c6de..daff38c 100644
    --- a/drivers/staging/iio/adc/ad7192.c
    +++ b/drivers/staging/iio/adc/ad7192.c
    @@ -341,7 +341,7 @@ static int ad7192_setup(struct ad7192_state *st,
    }

    static IIO_DEVICE_ATTR_NAMED(in_v_m_v_scale_available,
    - in_voltage-voltage_scale_available,
    + "in_voltage-voltage_scale_available",
    0444, ad7192_show_scale_available, NULL, 0);

    static IIO_DEVICE_ATTR(in_voltage_scale_available, 0444,
    diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
    index f85dde9..fd32e9a 100644
    --- a/drivers/staging/iio/adc/ad7280a.c
    +++ b/drivers/staging/iio/adc/ad7280a.c
    @@ -750,14 +750,14 @@ static irqreturn_t ad7280_event_handler(int irq, void *private)
    }

    static IIO_DEVICE_ATTR_NAMED(in_thresh_low_value,
    - in_voltage-voltage_thresh_low_value,
    + "in_voltage-voltage_thresh_low_value",
    0644,
    ad7280_read_channel_config,
    ad7280_write_channel_config,
    AD7280A_CELL_UNDERVOLTAGE);

    static IIO_DEVICE_ATTR_NAMED(in_thresh_high_value,
    - in_voltage-voltage_thresh_high_value,
    + "in_voltage-voltage_thresh_high_value",
    0644,
    ad7280_read_channel_config,
    ad7280_write_channel_config,
    diff --git a/include/linux/iio/sysfs.h b/include/linux/iio/sysfs.h
    index ce9426c..49c81a4 100644
    --- a/include/linux/iio/sysfs.h
    +++ b/include/linux/iio/sysfs.h
    @@ -55,6 +55,10 @@ struct iio_const_attr {
    { .dev_attr = __ATTR(_name, _mode, _show, _store), \
    .address = _addr }

    +#define IIO_ATTR_NAMED(_name, _mode, _show, _store, _addr) \
    + { .dev_attr = __ATTR_NAMED(_name, _mode, _show, _store), \
    + .address = _addr }
    +
    #define IIO_ATTR_RO(_name, _addr) \
    { .dev_attr = __ATTR_RO(_name), \
    .address = _addr }
    @@ -85,7 +89,7 @@ struct iio_const_attr {

    #define IIO_DEVICE_ATTR_NAMED(_vname, _name, _mode, _show, _store, _addr) \
    struct iio_dev_attr iio_dev_attr_##_vname \
    - = IIO_ATTR(_name, _mode, _show, _store, _addr)
    + = IIO_ATTR_NAMED(_name, _mode, _show, _store, _addr)

    #define IIO_CONST_ATTR(_name, _string) \
    struct iio_const_attr iio_const_attr_##_name \
    diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
    index aa02c32..20321cf 100644
    --- a/include/linux/sysfs.h
    +++ b/include/linux/sysfs.h
    @@ -104,6 +104,13 @@ struct attribute_group {
    .store = _store, \
    }

    +#define __ATTR_NAMED(_name, _mode, _show, _store) { \
    + .attr = {.name = _name, \
    + .mode = VERIFY_OCTAL_PERMISSIONS(_mode) }, \
    + .show = _show, \
    + .store = _store, \
    +}
    +
    #define __ATTR_PREALLOC(_name, _mode, _show, _store) { \
    .attr = {.name = __stringify(_name), \
    .mode = SYSFS_PREALLOC | VERIFY_OCTAL_PERMISSIONS(_mode) },\
    --
    1.9.1
    \
     
     \ /
      Last update: 2017-09-12 00:44    [W:3.104 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site