Modernize the driver by using IIO_DEVICE_ATTR_RW and
IIO_DEVICE_ATTR_RO macros. This involves renaming the callback
functions to standard <name>_show and <name>_store formats, making
the code cleaner and more maintainable.
Signed-off-by: Md. Mahmudul Hasan Mabud <mdmahmudulhasan1511@gmail.com>
---
drivers/staging/iio/adc/ad7816.c | 72 ++++++++++++++------------------
1 file changed, 32 insertions(+), 40 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c
index f2486cb29..80f84e2bb 100644
--- a/drivers/staging/iio/adc/ad7816.c
+++ b/drivers/staging/iio/adc/ad7816.c
@@ -121,9 +121,9 @@ static int ad7816_spi_write(struct ad7816_chip_info *chip, u8 data)
return ret;
}
-static ssize_t ad7816_show_mode(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t mode_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad7816_chip_info *chip = iio_priv(indio_dev);
@@ -131,10 +131,10 @@ static ssize_t ad7816_show_mode(struct device *dev,
return sysfs_emit(buf, "%s\n", ad7816_modes[chip->mode]);
}
-static ssize_t ad7816_store_mode(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+static ssize_t mode_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf,
+ size_t len)
{
struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad7816_chip_info *chip = iio_priv(indio_dev);
@@ -150,24 +150,20 @@ static ssize_t ad7816_store_mode(struct device *dev,
return len;
}
-static IIO_DEVICE_ATTR(mode, 0644,
- ad7816_show_mode,
- ad7816_store_mode,
- 0);
+static IIO_DEVICE_ATTR_RW(mode, 0);
-static ssize_t ad7816_show_available_modes(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t available_modes_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
return sysfs_emit(buf, "full\npower-save\n");
}
-static IIO_DEVICE_ATTR(available_modes, 0444, ad7816_show_available_modes,
- NULL, 0);
+static IIO_DEVICE_ATTR_RO(available_modes, 0);
-static ssize_t ad7816_show_channel(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t channel_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad7816_chip_info *chip = iio_priv(indio_dev);
@@ -175,10 +171,10 @@ static ssize_t ad7816_show_channel(struct device *dev,
return sysfs_emit(buf, "%d\n", chip->channel_id);
}
-static ssize_t ad7816_store_channel(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+static ssize_t channel_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf,
+ size_t len)
{
struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad7816_chip_info *chip = iio_priv(indio_dev);
@@ -208,14 +204,11 @@ static ssize_t ad7816_store_channel(struct device *dev,
return len;
}
-static IIO_DEVICE_ATTR(channel, 0644,
- ad7816_show_channel,
- ad7816_store_channel,
- 0);
+static IIO_DEVICE_ATTR_RW(channel, 0);
-static ssize_t ad7816_show_value(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t value_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad7816_chip_info *chip = iio_priv(indio_dev);
@@ -239,7 +232,7 @@ static ssize_t ad7816_show_value(struct device *dev,
return sysfs_emit(buf, "%u\n", data);
}
-static IIO_DEVICE_ATTR(value, 0444, ad7816_show_value, NULL, 0);
+static IIO_DEVICE_ATTR_RO(value, 0);
static struct attribute *ad7816_attributes[] = {
&iio_dev_attr_available_modes.dev_attr.attr,
@@ -269,9 +262,9 @@ static irqreturn_t ad7816_event_handler(int irq, void *private)
return IRQ_HANDLED;
}
-static ssize_t ad7816_show_oti(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t oti_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
{
struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad7816_chip_info *chip = iio_priv(indio_dev);
@@ -289,10 +282,10 @@ static ssize_t ad7816_show_oti(struct device *dev,
return sysfs_emit(buf, "%u\n", chip->oti_data[chip->channel_id]);
}
-static inline ssize_t ad7816_set_oti(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+static inline ssize_t oti_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf,
+ size_t len)
{
struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ad7816_chip_info *chip = iio_priv(indio_dev);
@@ -330,8 +323,7 @@ static inline ssize_t ad7816_set_oti(struct device *dev,
return len;
}
-static IIO_DEVICE_ATTR(oti, 0644,
- ad7816_show_oti, ad7816_set_oti, 0);
+static IIO_DEVICE_ATTR_RW(oti, 0);
static struct attribute *ad7816_event_attributes[] = {
&iio_dev_attr_oti.dev_attr.attr,
--
2.34.1
On Tue, Mar 31, 2026 at 12:17:10AM +0600, Md. Mahmudul Hasan Mabud wrote: > Modernize the driver by using IIO_DEVICE_ATTR_RW and IIO_DEVICE_ATTR_RW() > IIO_DEVICE_ATTR_RO macros. This involves renaming the callback IIO_DEVICE_ATTR_RO() > functions to standard <name>_show and <name>_store formats, making "...<name>_show() and <name>_store()..." > the code cleaner and more maintainable. ... > -static ssize_t ad7816_show_mode(struct device *dev, > - struct device_attribute *attr, > - char *buf) > +static ssize_t mode_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) You can use room on the previous line(s) static ssize_t mode_show(struct device *dev, struct device_attribute *attr, char *buf) ... > -static ssize_t ad7816_store_mode(struct device *dev, > - struct device_attribute *attr, > - const char *buf, > - size_t len) > +static ssize_t mode_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, > + size_t len) static ssize_t mode_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t len) And so on... ... > -static ssize_t ad7816_show_available_modes(struct device *dev, > - struct device_attribute *attr, > - char *buf) > +static ssize_t available_modes_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) This is okay to leave as is, as it might be too long (over 80). -- With Best Regards, Andy Shevchenko
© 2016 - 2026 Red Hat, Inc.