Series comparison

-[PATCH 0/4] iio: light: Modernize al3010 and al3320a codebase
+[PATCH v4 0/5] iio: light: Modernize al3010 and al3320a codebase
-This series targetting improved readability of code
+This series aims to improve code readability and modernize it to align
-and modernizing code to match today standards.
+with the recently upstreamed AL3000a.
-Except slightly improved error reporting,
+Apart from slightly improved error reporting, and error handling
-there shouldn't be any function changes.
+there should be no functional changes.
-Size before:
+Module  before after
-al3010.ko
+al3010  72 kB  58 kB
-al3320a.ko
+al3320a 72 kB  58 kB
 Size after:
 al3010.ko
 al3320a.ko
 Signed-off-by: David Heidelberg <david@ixit.cz>
 ---
-David Heidelberg (4):
+Changes in v4:
-      iio: light: al3320a: Drop deprecated email for Daniel
+- Fixed mixed-up rebase changes between commits and added
-      iio: light: al3000a: Use DRV_NAME
+  regmap_get_device into _init functions to get the device.
 - Link to v3: https://lore.kernel.org/r/20250402-al3010-iio-regmap-v3-0-cc3da273b5b2@ixit.cz
 Changes in v3:
 - Stripped patches merged from second version of patchset.
 - Dropped iio: light: al3010: Move devm_add_action_or_reset back to _probe
   in favor of opposite approach moving devm_add.. to _init for al3xx0a:
   - iio: light: al3000a: Fix an error handling path in al3000a_probe()
   - iio: light: al3320a: Fix an error handling path in al3320a_probe()
 - Link to v2: https://lore.kernel.org/r/20250319-al3010-iio-regmap-v2-0-1310729d0543@ixit.cz
 Changes in v2:
 - Dropped Daniel's email update.
 - Dropped DRV_NAME introduction for al3000a
 - Added DRV_NAME define removal for al3010 and al3320a.
 - Splitted unsigned int conversion into separate patches.
 - Replaced generic value with specific raw and gain variable.
 - Use dev_err_probe() for error handling.
 - Separated devm_add_action_or_reset move from _init back to _probe.
 - Dropped copyright update.
 - Link to v1: https://lore.kernel.org/r/20250308-al3010-iio-regmap-v1-0-b672535e8213@ixit.cz
 ---
 David Heidelberg (5):
       iio: light: al3010: Improve al3010_init error handling with dev_err_probe()
       iio: light: al3000a: Fix an error handling path in al3000a_probe()
       iio: light: al3320a: Fix an error handling path in al3320a_probe()
       iio: light: al3010: Implement regmap support
       iio: light: al3320a: Implement regmap support
- drivers/iio/light/al3000a.c |   6 ++-
+ drivers/iio/light/al3000a.c |  9 +++--
- drivers/iio/light/al3010.c  |  95 ++++++++++++++++++++++------------------
+ drivers/iio/light/al3010.c  | 85 +++++++++++++++++++++++--------------------
- drivers/iio/light/al3320a.c | 103 ++++++++++++++++++++++++--------------------
+ drivers/iio/light/al3320a.c | 89 +++++++++++++++++++++++++--------------------
-files changed, 114 insertions(+), 90 deletions(-)
+files changed, 100 insertions(+), 83 deletions(-)
 ---
-base-commit: 0a2f889128969dab41861b6e40111aa03dc57014
+base-commit: f8ffc92ae9052e6615896052f0c5b808bfc17520
 change-id: 20250308-al3010-iio-regmap-038cea39f85d
 Best regards,
 --
 David Heidelberg <david@ixit.cz>

-New patch
+[PATCH v4 1/5] iio: light: al3010: Improve al3010_init error handling with dev_err_probe()
+From: David Heidelberg <david@ixit.cz>
+Minor code simplifications and improved error reporting.
+Signed-off-by: David Heidelberg <david@ixit.cz>
+---
+ drivers/iio/light/al3010.c | 10 ++++------
+file changed, 4 insertions(+), 6 deletions(-)
+diff --git a/drivers/iio/light/al3010.c b/drivers/iio/light/al3010.c
+index XXXXXXX..XXXXXXX 100644
+--- a/drivers/iio/light/al3010.c
++++ b/drivers/iio/light/al3010.c
+@@ -XXX,XX +XXX,XX @@ static int al3010_init(struct al3010_data *data)
+     ret = devm_add_action_or_reset(&data->client->dev,
+                        al3010_set_pwr_off,
+                        data);
+-    if (ret < 0)
+-        return ret;
++    if (ret)
++        return dev_err_probe(&data->client->dev, ret, "failed to add action\n");
+     ret = i2c_smbus_write_byte_data(data->client, AL3010_REG_CONFIG,
+                     FIELD_PREP(AL3010_GAIN_MASK,
+@@ -XXX,XX +XXX,XX @@ static int al3010_probe(struct i2c_client *client)
+     indio_dev->modes = INDIO_DIRECT_MODE;
+     ret = al3010_init(data);
+-    if (ret < 0) {
+-        dev_err(dev, "al3010 chip init failed\n");
+-        return ret;
+-    }
++    if (ret)
++        return dev_err_probe(dev, ret, "failed to init ALS\n");
+     return devm_iio_device_register(dev, indio_dev);
+ }
+--
+.49.0

-[PATCH 2/4] iio: light: al3000a: Use DRV_NAME
+[PATCH v4 2/5] iio: light: al3000a: Fix an error handling path in al3000a_probe()
 From: David Heidelberg <david@ixit.cz>
-Sync syntax with other similar drivers.
+If regmap_write() fails in al3000a_init(), al3000a_set_pwr_off is
 not called.
 In order to avoid such a situation, move the devm_add_action_or_reset()
 which calls al3000a_set_pwr_off right after a successful
 al3000a_set_pwr_on.
 Signed-off-by: David Heidelberg <david@ixit.cz>
 ---
- drivers/iio/light/al3000a.c | 6 ++++--
+ drivers/iio/light/al3000a.c | 9 +++++----
-file changed, 4 insertions(+), 2 deletions(-)
+file changed, 5 insertions(+), 4 deletions(-)
 diff --git a/drivers/iio/light/al3000a.c b/drivers/iio/light/al3000a.c
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/iio/light/al3000a.c
 +++ b/drivers/iio/light/al3000a.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ static void al3000a_set_pwr_off(void *_data)
- #include <linux/iio/iio.h>
+ static int al3000a_init(struct al3000a_data *data)
+ {
-+#define AL3000A_DRV_NAME "al3000a"
++    struct device *dev = regmap_get_device(data->regmap);
      int ret;
      ret = al3000a_set_pwr_on(data);
      if (ret)
          return ret;
 +    ret = devm_add_action_or_reset(dev, al3000a_set_pwr_off, data);
 +    if (ret)
 +        return dev_err_probe(dev, ret, "failed to add action\n");
 +
- #define AL3000A_REG_SYSTEM        0x00
+     ret = regmap_write(data->regmap, AL3000A_REG_SYSTEM, AL3000A_CONFIG_RESET);
- #define AL3000A_REG_DATA        0x05
+     if (ret)
+         return ret;
 @@ -XXX,XX +XXX,XX @@ static int al3000a_probe(struct i2c_client *client)
-                      "failed to get vdd regulator\n");
+     if (ret)
+         return dev_err_probe(dev, ret, "failed to init ALS\n");
-     indio_dev->info = &al3000a_info;
--    indio_dev->name = "al3000a";
+-    ret = devm_add_action_or_reset(dev, al3000a_set_pwr_off, data);
-+    indio_dev->name = AL3000A_DRV_NAME;
+-    if (ret)
-     indio_dev->channels = al3000a_channels;
+-        return dev_err_probe(dev, ret, "failed to add action\n");
-     indio_dev->num_channels = ARRAY_SIZE(al3000a_channels);
+-
-     indio_dev->modes = INDIO_DIRECT_MODE;
+     return devm_iio_device_register(dev, indio_dev);
-@@ -XXX,XX +XXX,XX @@ MODULE_DEVICE_TABLE(of, al3000a_of_match);
+ }
  static struct i2c_driver al3000a_driver = {
      .driver = {
 -        .name = "al3000a",
 +        .name = AL3000A_DRV_NAME,
          .of_match_table = al3000a_of_match,
          .pm = pm_sleep_ptr(&al3000a_pm_ops),
      },
 --
-.47.2
+.49.0

-[PATCH 1/4] iio: light: al3320a: Drop deprecated email for Daniel
+[PATCH v4 3/5] iio: light: al3320a: Fix an error handling path in al3320a_probe()
 From: David Heidelberg <david@ixit.cz>
-He no longer works at Intel.
+If regmap_write() fails in al3320a_init(), al3320a_set_pwr_off is
 not called.
 In order to avoid such a situation, move the devm_add_action_or_reset()
 which calls al3320a_set_pwr_off right after a successful
 al3320a_set_pwr_on.
 Signed-off-by: David Heidelberg <david@ixit.cz>
 ---
- drivers/iio/light/al3320a.c | 2 +-
+ drivers/iio/light/al3320a.c | 10 ++++++----
-file changed, 1 insertion(+), 1 deletion(-)
+file changed, 6 insertions(+), 4 deletions(-)
 diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/iio/light/al3320a.c
 +++ b/drivers/iio/light/al3320a.c
-@@ -XXX,XX +XXX,XX @@ static struct i2c_driver al3320a_driver = {
+@@ -XXX,XX +XXX,XX @@ static int al3320a_init(struct al3320a_data *data)
+     if (ret < 0)
- module_i2c_driver(al3320a_driver);
+         return ret;
--MODULE_AUTHOR("Daniel Baluta <daniel.baluta@intel.com>");
++    ret = devm_add_action_or_reset(&data->client->dev,
-+MODULE_AUTHOR("Daniel Baluta");
++                       al3320a_set_pwr_off,
- MODULE_DESCRIPTION("AL3320A Ambient Light Sensor driver");
++                       data);
- MODULE_LICENSE("GPL v2");
++    if (ret)
 +        return dev_err_probe(&data->client->dev, ret, "failed to add action\n");
 +
      ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG_RANGE,
                      FIELD_PREP(AL3320A_GAIN_MASK,
                             AL3320A_RANGE_3));
@@ -XXX,XX +XXX,XX @@ static int al3320a_probe(struct i2c_client *client)
          return ret;
      }
 -    ret = devm_add_action_or_reset(dev, al3320a_set_pwr_off, data);
 -    if (ret < 0)
 -        return ret;
 -
      return devm_iio_device_register(dev, indio_dev);
  }
 --
-.47.2
+.49.0

-[PATCH 3/4] iio: light: al3010: Implement regmap support
+[PATCH v4 4/5] iio: light: al3010: Implement regmap support
 From: David Heidelberg <david@ixit.cz>
-Modernize and make driver a bit cleaner.
+Modernize and clean up the driver using the regmap framework.
-Incorporate most of the feedback given on new AL3000A.
+With the regmap implementation, the compiler produces
 a significantly smaller module.
 Size before: 72 kB
 Size after:  58 kB
 Signed-off-by: David Heidelberg <david@ixit.cz>
 ---
- drivers/iio/light/al3010.c | 95 ++++++++++++++++++++++++++--------------------
+ drivers/iio/light/al3010.c | 77 +++++++++++++++++++++++++---------------------
-file changed, 53 insertions(+), 42 deletions(-)
+file changed, 42 insertions(+), 35 deletions(-)
 diff --git a/drivers/iio/light/al3010.c b/drivers/iio/light/al3010.c
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/iio/light/al3010.c
 +++ b/drivers/iio/light/al3010.c
 @@ -XXX,XX +XXX,XX @@
-  *
-  * Copyright (c) 2014, Intel Corporation.
-  * Copyright (c) 2016, Dyna-Image Corp.
-- * Copyright (c) 2020, David Heidelberg, Michał Mirosław, Dmitry Osipenko
-+ * Copyright (c) 2020 - 2025, David Heidelberg, Michał Mirosław, Dmitry Osipenko
-  *
-  * IIO driver for AL3010 (7-bit I2C slave address 0x1C).
-  *
-@@ -XXX,XX +XXX,XX @@
  #include <linux/bitfield.h>
  #include <linux/i2c.h>
  #include <linux/module.h>
 +#include <linux/regmap.h>
  #include <linux/mod_devicetable.h>
 ...
  static const struct iio_chan_spec al3010_channels[] = {
 @@ -XXX,XX +XXX,XX @@ static const struct attribute_group al3010_attribute_group = {
      .attrs = al3010_attributes,
  };
--static int al3010_set_pwr(struct i2c_client *client, bool pwr)
+-static int al3010_set_pwr_on(struct i2c_client *client)
 +static int al3010_set_pwr_on(struct al3010_data *data)
  {
--    u8 val = pwr ? AL3010_CONFIG_ENABLE : AL3010_CONFIG_DISABLE;
+-    return i2c_smbus_write_byte_data(client, AL3010_REG_SYSTEM,
--    return i2c_smbus_write_byte_data(client, AL3010_REG_SYSTEM, val);
+-                     AL3010_CONFIG_ENABLE);
 +    return regmap_write(data->regmap, AL3010_REG_SYSTEM, AL3010_CONFIG_ENABLE);
  }
  static void al3010_set_pwr_off(void *_data)
  {
      struct al3010_data *data = _data;
 +    struct device *dev = regmap_get_device(data->regmap);
 +    int ret;
--    al3010_set_pwr(data->client, false);
+-    i2c_smbus_write_byte_data(data->client, AL3010_REG_SYSTEM,
 -                  AL3010_CONFIG_DISABLE);
 +    ret = regmap_write(data->regmap, AL3010_REG_SYSTEM, AL3010_CONFIG_DISABLE);
 +    if (ret)
 +        dev_err(dev, "failed to write system register\n");
  }
  static int al3010_init(struct al3010_data *data)
  {
++    struct device *dev = regmap_get_device(data->regmap);
      int ret;
--    ret = al3010_set_pwr(data->client, true);
+-    ret = al3010_set_pwr_on(data->client);
 -    if (ret < 0)
--        return ret;
++    ret = al3010_set_pwr_on(data);
--
++    if (ret)
          return ret;
 -    ret = devm_add_action_or_reset(&data->client->dev,
 -                       al3010_set_pwr_off,
 -                       data);
--    if (ret < 0)
++    ret = devm_add_action_or_reset(dev, al3010_set_pwr_off, data);
--        return ret;
+     if (ret)
 -        return dev_err_probe(&data->client->dev, ret, "failed to add action\n");
 -
 -    ret = i2c_smbus_write_byte_data(data->client, AL3010_REG_CONFIG,
 -                    FIELD_PREP(AL3010_GAIN_MASK,
 -                           AL3XXX_RANGE_3));
 -    if (ret < 0)
-+    ret = al3010_set_pwr_on(data);
+-        return ret;
-+    if (ret)
++        return dev_err_probe(dev, ret, "failed to add action\n");
          return ret;
 -    return 0;
 +    return regmap_write(data->regmap, AL3010_REG_CONFIG,
 +                FIELD_PREP(AL3010_GAIN_MASK, AL3XXX_RANGE_3));
  }
 ...
 @@ -XXX,XX +XXX,XX @@ static int al3010_read_raw(struct iio_dev *indio_dev,
                 int *val2, long mask)
  {
      struct al3010_data *data = iio_priv(indio_dev);
 -    int ret;
-+    int ret, value;
++    int ret, gain, raw;
      switch (mask) {
      case IIO_CHAN_INFO_RAW:
 @@ -XXX,XX +XXX,XX @@ static int al3010_read_raw(struct iio_dev *indio_dev,
           * - low byte of output is stored at AL3010_REG_DATA_LOW
           * - high byte of output is stored at AL3010_REG_DATA_LOW + 1
           */
 -        ret = i2c_smbus_read_word_data(data->client,
 -                           AL3010_REG_DATA_LOW);
 -        if (ret < 0)
-+        ret = regmap_read(data->regmap, AL3010_REG_DATA_LOW, &value);
++        ret = regmap_read(data->regmap, AL3010_REG_DATA_LOW, &raw);
 +        if (ret)
              return ret;
 -        *val = ret;
 +
-+        *val = value;
++        *val = raw;
 +
          return IIO_VAL_INT;
      case IIO_CHAN_INFO_SCALE:
 -        ret = i2c_smbus_read_byte_data(data->client,
 -                           AL3010_REG_CONFIG);
 -        if (ret < 0)
-+        ret = regmap_read(data->regmap, AL3010_REG_CONFIG, &value);
++        ret = regmap_read(data->regmap, AL3010_REG_CONFIG, &gain);
 +        if (ret)
              return ret;
 -        ret = FIELD_GET(AL3010_GAIN_MASK, ret);
 -        *val = al3010_scales[ret][0];
 -        *val2 = al3010_scales[ret][1];
-+        value = FIELD_GET(AL3010_GAIN_MASK, value);
++        gain = FIELD_GET(AL3010_GAIN_MASK, gain);
-+        *val = al3010_scales[value][0];
++        *val = al3010_scales[gain][0];
-+        *val2 = al3010_scales[value][1];
++        *val2 = al3010_scales[gain][1];
          return IIO_VAL_INT_PLUS_MICRO;
      }
 @@ -XXX,XX +XXX,XX @@ static int al3010_write_raw(struct iio_dev *indio_dev,
-                 int val2, long mask)
- {
-     struct al3010_data *data = iio_priv(indio_dev);
--    int i;
-+    unsigned int i;
-     switch (mask) {
-     case IIO_CHAN_INFO_SCALE:
-@@ -XXX,XX +XXX,XX @@ static int al3010_write_raw(struct iio_dev *indio_dev,
                  val2 != al3010_scales[i][1])
                  continue;
 -            return i2c_smbus_write_byte_data(data->client,
 -                    AL3010_REG_CONFIG,
 -                    FIELD_PREP(AL3010_GAIN_MASK, i));
 +            return regmap_write(data->regmap, AL3010_REG_CONFIG,
 +                        FIELD_PREP(AL3010_GAIN_MASK, i));
          }
          break;
      }
-@@ -XXX,XX +XXX,XX @@ static const struct iio_info al3010_info = {
+@@ -XXX,XX +XXX,XX @@ static int al3010_probe(struct i2c_client *client)
  static int al3010_probe(struct i2c_client *client)
  {
      struct al3010_data *data;
 +    struct device *dev = &client->dev;
      struct iio_dev *indio_dev;
      int ret;
 -    indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
 +    indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
      if (!indio_dev)
          return -ENOMEM;
      data = iio_priv(indio_dev);
      i2c_set_clientdata(client, indio_dev);
 -    data->client = client;
 +    data->regmap = devm_regmap_init_i2c(client, &al3010_regmap_config);
 +    if (IS_ERR(data->regmap))
 +        return dev_err_probe(dev, PTR_ERR(data->regmap),
 +                     "cannot allocate regmap\n");
      indio_dev->info = &al3010_info;
-     indio_dev->name = AL3010_DRV_NAME;
+     indio_dev->name = "al3010";
-@@ -XXX,XX +XXX,XX @@ static int al3010_probe(struct i2c_client *client)
+@@ -XXX,XX +XXX,XX @@ static int al3010_suspend(struct device *dev)
      ret = al3010_init(data);
      if (ret < 0) {
 -        dev_err(&client->dev, "al3010 chip init failed\n");
 +        dev_err(dev, "failed to init ALS\n");
          return ret;
      }
 -    return devm_iio_device_register(&client->dev, indio_dev);
 +    ret = devm_add_action_or_reset(dev, al3010_set_pwr_off, data);
 +    if (ret < 0)
 +        return ret;
 +
 +    return devm_iio_device_register(dev, indio_dev);
  }
  static int al3010_suspend(struct device *dev)
  {
 -    return al3010_set_pwr(to_i2c_client(dev), false);
 +    struct al3010_data *data = iio_priv(dev_get_drvdata(dev));
 +
 +    al3010_set_pwr_off(data);
 +    return 0;
  }
  static int al3010_resume(struct device *dev)
  {
--    return al3010_set_pwr(to_i2c_client(dev), true);
+-    return al3010_set_pwr_on(to_i2c_client(dev));
 +    struct al3010_data *data = iio_priv(dev_get_drvdata(dev));
 +
 +    return al3010_set_pwr_on(data);
  }
  static DEFINE_SIMPLE_DEV_PM_OPS(al3010_pm_ops, al3010_suspend, al3010_resume);
 --
-.47.2
+.49.0

-[PATCH 4/4] iio: light: al3320a: Implement regmap support
+[PATCH v4 5/5] iio: light: al3320a: Implement regmap support
 From: David Heidelberg <david@ixit.cz>
-Modernize and make driver a bit cleaner.
+Modernize and clean up the driver using the regmap framework.
-Incorporate most of the feedback given on new AL3000A.
+With the regmap implementation, the compiler produces
 a significantly smaller module.
 Size before: 72 kB
 Size after:  58 kB
 Signed-off-by: David Heidelberg <david@ixit.cz>
 ---
- drivers/iio/light/al3320a.c | 101 ++++++++++++++++++++++++--------------------
+ drivers/iio/light/al3320a.c | 89 +++++++++++++++++++++++++--------------------
-file changed, 56 insertions(+), 45 deletions(-)
+file changed, 49 insertions(+), 40 deletions(-)
 diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
 index XXXXXXX..XXXXXXX 100644
 --- a/drivers/iio/light/al3320a.c
 +++ b/drivers/iio/light/al3320a.c
 ...
  static const struct iio_chan_spec al3320a_channels[] = {
 @@ -XXX,XX +XXX,XX @@ static const struct attribute_group al3320a_attribute_group = {
      .attrs = al3320a_attributes,
  };
--static int al3320a_set_pwr(struct i2c_client *client, bool pwr)
+-static int al3320a_set_pwr_on(struct i2c_client *client)
 +static int al3320a_set_pwr_on(struct al3320a_data *data)
  {
--    u8 val = pwr ? AL3320A_CONFIG_ENABLE : AL3320A_CONFIG_DISABLE;
+-    return i2c_smbus_write_byte_data(client, AL3320A_REG_CONFIG, AL3320A_CONFIG_ENABLE);
 -    return i2c_smbus_write_byte_data(client, AL3320A_REG_CONFIG, val);
 +    return regmap_write(data->regmap, AL3320A_REG_CONFIG, AL3320A_CONFIG_ENABLE);
  }
  static void al3320a_set_pwr_off(void *_data)
  {
      struct al3320a_data *data = _data;
 +    struct device *dev = regmap_get_device(data->regmap);
 +    int ret;
--    al3320a_set_pwr(data->client, false);
+-    i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG, AL3320A_CONFIG_DISABLE);
 +    ret = regmap_write(data->regmap, AL3320A_REG_CONFIG, AL3320A_CONFIG_DISABLE);
 +    if (ret)
 +        dev_err(dev, "failed to write system register\n");
  }
  static int al3320a_init(struct al3320a_data *data)
  {
++    struct device *dev = regmap_get_device(data->regmap);
      int ret;
--    ret = al3320a_set_pwr(data->client, true);
+-    ret = al3320a_set_pwr_on(data->client);
 -
 -    if (ret < 0)
 +    ret = al3320a_set_pwr_on(data);
 +    if (ret)
          return ret;
+-    ret = devm_add_action_or_reset(&data->client->dev,
+-                       al3320a_set_pwr_off,
+-                       data);
++    ret = devm_add_action_or_reset(dev, al3320a_set_pwr_off, data);
+     if (ret)
+-        return dev_err_probe(&data->client->dev, ret, "failed to add action\n");
+-
 -    ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG_RANGE,
 -                    FIELD_PREP(AL3320A_GAIN_MASK,
 -                           AL3320A_RANGE_3));
 -    if (ret < 0)
 -        return ret;
--
++        return dev_err_probe(dev, ret, "failed to add action\n");
 -    ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_MEAN_TIME,
 -                    AL3320A_DEFAULT_MEAN_TIME);
 -    if (ret < 0)
 +    ret = regmap_write(data->regmap, AL3320A_REG_CONFIG_RANGE,
 +               FIELD_PREP(AL3320A_GAIN_MASK, AL3320A_RANGE_3));
 ...
 @@ -XXX,XX +XXX,XX @@ static int al3320a_read_raw(struct iio_dev *indio_dev,
                  int *val2, long mask)
  {
      struct al3320a_data *data = iio_priv(indio_dev);
 -    int ret;
-+    int ret, value;
++    int ret, gain, raw;
      switch (mask) {
      case IIO_CHAN_INFO_RAW:
 @@ -XXX,XX +XXX,XX @@ static int al3320a_read_raw(struct iio_dev *indio_dev,
           * - low byte of output is stored at AL3320A_REG_DATA_LOW
           * - high byte of output is stored at AL3320A_REG_DATA_LOW + 1
           */
 -        ret = i2c_smbus_read_word_data(data->client,
 -                           AL3320A_REG_DATA_LOW);
 -        if (ret < 0)
-+        ret = regmap_read(data->regmap, AL3320A_REG_DATA_LOW, &value);
++        ret = regmap_read(data->regmap, AL3320A_REG_DATA_LOW, &raw);
 +        if (ret)
              return ret;
 -        *val = ret;
 +
-+        *val = value;
++        *val = raw;
 +
          return IIO_VAL_INT;
      case IIO_CHAN_INFO_SCALE:
 -        ret = i2c_smbus_read_byte_data(data->client,
 -                           AL3320A_REG_CONFIG_RANGE);
 -        if (ret < 0)
-+        ret = regmap_read(data->regmap, AL3320A_REG_CONFIG_RANGE, &value);
++        ret = regmap_read(data->regmap, AL3320A_REG_CONFIG_RANGE, &gain);
 +        if (ret)
              return ret;
 -        ret = FIELD_GET(AL3320A_GAIN_MASK, ret);
 -        *val = al3320a_scales[ret][0];
 -        *val2 = al3320a_scales[ret][1];
-+        value = FIELD_GET(AL3320A_GAIN_MASK, value);
++        gain = FIELD_GET(AL3320A_GAIN_MASK, gain);
-+        *val = al3320a_scales[value][0];
++        *val = al3320a_scales[gain][0];
-+        *val2 = al3320a_scales[value][1];
++        *val2 = al3320a_scales[gain][1];
          return IIO_VAL_INT_PLUS_MICRO;
      }
 @@ -XXX,XX +XXX,XX @@ static int al3320a_write_raw(struct iio_dev *indio_dev,
-                  int val2, long mask)
- {
-     struct al3320a_data *data = iio_priv(indio_dev);
--    int i;
-+    unsigned int i;
-     switch (mask) {
-     case IIO_CHAN_INFO_SCALE:
-@@ -XXX,XX +XXX,XX @@ static int al3320a_write_raw(struct iio_dev *indio_dev,
                  val2 != al3320a_scales[i][1])
                  continue;
 -            return i2c_smbus_write_byte_data(data->client,
 -                    AL3320A_REG_CONFIG_RANGE,
 -                    FIELD_PREP(AL3320A_GAIN_MASK, i));
 +            return regmap_write(data->regmap, AL3320A_REG_CONFIG_RANGE,
 +                        FIELD_PREP(AL3320A_GAIN_MASK, i));
          }
          break;
      }
-@@ -XXX,XX +XXX,XX @@ static const struct iio_info al3320a_info = {
+@@ -XXX,XX +XXX,XX @@ static int al3320a_probe(struct i2c_client *client)
  static int al3320a_probe(struct i2c_client *client)
  {
      struct al3320a_data *data;
 +    struct device *dev = &client->dev;
      struct iio_dev *indio_dev;
      int ret;
 -    indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
 +    indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
      if (!indio_dev)
          return -ENOMEM;
      data = iio_priv(indio_dev);
      i2c_set_clientdata(client, indio_dev);
 -    data->client = client;
 +
 +    data->regmap = devm_regmap_init_i2c(client, &al3320a_regmap_config);
 +    if (IS_ERR(data->regmap))
 +        return dev_err_probe(dev, PTR_ERR(data->regmap),
 +                     "cannot allocate regmap\n");
      indio_dev->info = &al3320a_info;
-     indio_dev->name = AL3320A_DRV_NAME;
+     indio_dev->name = "al3320a";
-@@ -XXX,XX +XXX,XX @@ static int al3320a_probe(struct i2c_client *client)
+@@ -XXX,XX +XXX,XX @@ static int al3320a_suspend(struct device *dev)
      ret = al3320a_init(data);
      if (ret < 0) {
 -        dev_err(&client->dev, "al3320a chip init failed\n");
 +        dev_err(dev, "failed to init ALS\n");
          return ret;
      }
 -    ret = devm_add_action_or_reset(&client->dev,
 -                    al3320a_set_pwr_off,
 -                    data);
 +    ret = devm_add_action_or_reset(dev, al3320a_set_pwr_off, data);
      if (ret < 0)
          return ret;
 -    return devm_iio_device_register(&client->dev, indio_dev);
 +    return devm_iio_device_register(dev, indio_dev);
  }
  static int al3320a_suspend(struct device *dev)
  {
 -    return al3320a_set_pwr(to_i2c_client(dev), false);
 +    struct al3320a_data *data = iio_priv(dev_get_drvdata(dev));
 +
 +    al3320a_set_pwr_off(data);
 +    return 0;
  }
  static int al3320a_resume(struct device *dev)
  {
--    return al3320a_set_pwr(to_i2c_client(dev), true);
+-    return al3320a_set_pwr_on(to_i2c_client(dev));
 +    struct al3320a_data *data = iio_priv(dev_get_drvdata(dev));
 +
 +    return al3320a_set_pwr_on(data);
  }
  static DEFINE_SIMPLE_DEV_PM_OPS(al3320a_pm_ops, al3320a_suspend,
 --
-.47.2
+.49.0

From: David Heidelberg <david@ixit.cz>

Sync syntax with other similar drivers.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 drivers/iio/light/al3000a.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/light/al3000a.c b/drivers/iio/light/al3000a.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/iio/light/al3000a.c
+++ b/drivers/iio/light/al3000a.c
@@ -XXX,XX +XXX,XX @@
 
 #include <linux/iio/iio.h>
 
+#define AL3000A_DRV_NAME "al3000a"
+
 #define AL3000A_REG_SYSTEM		0x00
 #define AL3000A_REG_DATA		0x05
 
@@ -XXX,XX +XXX,XX @@ static int al3000a_probe(struct i2c_client *client)
 				     "failed to get vdd regulator\n");
 
 	indio_dev->info = &al3000a_info;
-	indio_dev->name = "al3000a";
+	indio_dev->name = AL3000A_DRV_NAME;
 	indio_dev->channels = al3000a_channels;
 	indio_dev->num_channels = ARRAY_SIZE(al3000a_channels);
 	indio_dev->modes = INDIO_DIRECT_MODE;
@@ -XXX,XX +XXX,XX @@ MODULE_DEVICE_TABLE(of, al3000a_of_match);
 
 static struct i2c_driver al3000a_driver = {
 	.driver = {
-		.name = "al3000a",
+		.name = AL3000A_DRV_NAME,
 		.of_match_table = al3000a_of_match,
 		.pm = pm_sleep_ptr(&al3000a_pm_ops),
 	},

-- 
2.47.2

From: David Heidelberg <david@ixit.cz>

Modernize and make driver a bit cleaner.

Incorporate most of the feedback given on new AL3000A.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 drivers/iio/light/al3010.c | 95 ++++++++++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 42 deletions(-)

diff --git a/drivers/iio/light/al3010.c b/drivers/iio/light/al3010.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/iio/light/al3010.c
+++ b/drivers/iio/light/al3010.c
@@ -XXX,XX +XXX,XX @@
  *
  * Copyright (c) 2014, Intel Corporation.
  * Copyright (c) 2016, Dyna-Image Corp.
- * Copyright (c) 2020, David Heidelberg, Michał Mirosław, Dmitry Osipenko
+ * Copyright (c) 2020 - 2025, David Heidelberg, Michał Mirosław, Dmitry Osipenko
  *
  * IIO driver for AL3010 (7-bit I2C slave address 0x1C).
  *
@@ -XXX,XX +XXX,XX @@
 #include <linux/bitfield.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
+#include <linux/regmap.h>
 #include <linux/mod_devicetable.h>
 
 #include <linux/iio/iio.h>
@@ -XXX,XX +XXX,XX @@ static const int al3010_scales[][2] = {
 	{0, 1187200}, {0, 296800}, {0, 74200}, {0, 18600}
 };
 
+static const struct regmap_config al3010_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+	.max_register = AL3010_REG_CONFIG,
+};
+
 struct al3010_data {
-	struct i2c_client *client;
+	struct regmap *regmap;
 };
 
 static const struct iio_chan_spec al3010_channels[] = {
@@ -XXX,XX +XXX,XX @@ static const struct attribute_group al3010_attribute_group = {
 	.attrs = al3010_attributes,
 };
 
-static int al3010_set_pwr(struct i2c_client *client, bool pwr)
+static int al3010_set_pwr_on(struct al3010_data *data)
 {
-	u8 val = pwr ? AL3010_CONFIG_ENABLE : AL3010_CONFIG_DISABLE;
-	return i2c_smbus_write_byte_data(client, AL3010_REG_SYSTEM, val);
+	return regmap_write(data->regmap, AL3010_REG_SYSTEM, AL3010_CONFIG_ENABLE);
 }
 
 static void al3010_set_pwr_off(void *_data)
 {
 	struct al3010_data *data = _data;
+	struct device *dev = regmap_get_device(data->regmap);
+	int ret;
 
-	al3010_set_pwr(data->client, false);
+	ret = regmap_write(data->regmap, AL3010_REG_SYSTEM, AL3010_CONFIG_DISABLE);
+	if (ret)
+		dev_err(dev, "failed to write system register\n");
 }
 
 static int al3010_init(struct al3010_data *data)
 {
 	int ret;
 
-	ret = al3010_set_pwr(data->client, true);
-	if (ret < 0)
-		return ret;
-
-	ret = devm_add_action_or_reset(&data->client->dev,
-				       al3010_set_pwr_off,
-				       data);
-	if (ret < 0)
-		return ret;
-
-	ret = i2c_smbus_write_byte_data(data->client, AL3010_REG_CONFIG,
-					FIELD_PREP(AL3010_GAIN_MASK,
-						   AL3XXX_RANGE_3));
-	if (ret < 0)
+	ret = al3010_set_pwr_on(data);
+	if (ret)
 		return ret;
 
-	return 0;
+	return regmap_write(data->regmap, AL3010_REG_CONFIG,
+			    FIELD_PREP(AL3010_GAIN_MASK, AL3XXX_RANGE_3));
 }
 
 static int al3010_read_raw(struct iio_dev *indio_dev,
@@ -XXX,XX +XXX,XX @@ static int al3010_read_raw(struct iio_dev *indio_dev,
 			   int *val2, long mask)
 {
 	struct al3010_data *data = iio_priv(indio_dev);
-	int ret;
+	int ret, value;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
@@ -XXX,XX +XXX,XX @@ static int al3010_read_raw(struct iio_dev *indio_dev,
 		 * - low byte of output is stored at AL3010_REG_DATA_LOW
 		 * - high byte of output is stored at AL3010_REG_DATA_LOW + 1
 		 */
-		ret = i2c_smbus_read_word_data(data->client,
-					       AL3010_REG_DATA_LOW);
-		if (ret < 0)
+		ret = regmap_read(data->regmap, AL3010_REG_DATA_LOW, &value);
+		if (ret)
 			return ret;
-		*val = ret;
+
+		*val = value;
+
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		ret = i2c_smbus_read_byte_data(data->client,
-					       AL3010_REG_CONFIG);
-		if (ret < 0)
+		ret = regmap_read(data->regmap, AL3010_REG_CONFIG, &value);
+		if (ret)
 			return ret;
 
-		ret = FIELD_GET(AL3010_GAIN_MASK, ret);
-		*val = al3010_scales[ret][0];
-		*val2 = al3010_scales[ret][1];
+		value = FIELD_GET(AL3010_GAIN_MASK, value);
+		*val = al3010_scales[value][0];
+		*val2 = al3010_scales[value][1];
 
 		return IIO_VAL_INT_PLUS_MICRO;
 	}
@@ -XXX,XX +XXX,XX @@ static int al3010_write_raw(struct iio_dev *indio_dev,
 			    int val2, long mask)
 {
 	struct al3010_data *data = iio_priv(indio_dev);
-	int i;
+	unsigned int i;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_SCALE:
@@ -XXX,XX +XXX,XX @@ static int al3010_write_raw(struct iio_dev *indio_dev,
 			    val2 != al3010_scales[i][1])
 				continue;
 
-			return i2c_smbus_write_byte_data(data->client,
-					AL3010_REG_CONFIG,
-					FIELD_PREP(AL3010_GAIN_MASK, i));
+			return regmap_write(data->regmap, AL3010_REG_CONFIG,
+					    FIELD_PREP(AL3010_GAIN_MASK, i));
 		}
 		break;
 	}
@@ -XXX,XX +XXX,XX @@ static const struct iio_info al3010_info = {
 static int al3010_probe(struct i2c_client *client)
 {
 	struct al3010_data *data;
+	struct device *dev = &client->dev;
 	struct iio_dev *indio_dev;
 	int ret;
 
-	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+	indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
 	if (!indio_dev)
 		return -ENOMEM;
 
 	data = iio_priv(indio_dev);
 	i2c_set_clientdata(client, indio_dev);
-	data->client = client;
+	data->regmap = devm_regmap_init_i2c(client, &al3010_regmap_config);
+	if (IS_ERR(data->regmap))
+		return dev_err_probe(dev, PTR_ERR(data->regmap),
+				     "cannot allocate regmap\n");
 
 	indio_dev->info = &al3010_info;
 	indio_dev->name = AL3010_DRV_NAME;
@@ -XXX,XX +XXX,XX @@ static int al3010_probe(struct i2c_client *client)
 
 	ret = al3010_init(data);
 	if (ret < 0) {
-		dev_err(&client->dev, "al3010 chip init failed\n");
+		dev_err(dev, "failed to init ALS\n");
 		return ret;
 	}
 
-	return devm_iio_device_register(&client->dev, indio_dev);
+	ret = devm_add_action_or_reset(dev, al3010_set_pwr_off, data);
+	if (ret < 0)
+		return ret;
+
+	return devm_iio_device_register(dev, indio_dev);
 }
 
 static int al3010_suspend(struct device *dev)
 {
-	return al3010_set_pwr(to_i2c_client(dev), false);
+	struct al3010_data *data = iio_priv(dev_get_drvdata(dev));
+
+	al3010_set_pwr_off(data);
+	return 0;
 }
 
 static int al3010_resume(struct device *dev)
 {
-	return al3010_set_pwr(to_i2c_client(dev), true);
+	struct al3010_data *data = iio_priv(dev_get_drvdata(dev));
+
+	return al3010_set_pwr_on(data);
 }
 
 static DEFINE_SIMPLE_DEV_PM_OPS(al3010_pm_ops, al3010_suspend, al3010_resume);

-- 
2.47.2

From: David Heidelberg <david@ixit.cz>

Modernize and make driver a bit cleaner.

Incorporate most of the feedback given on new AL3000A.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 drivers/iio/light/al3320a.c | 101 ++++++++++++++++++++++++--------------------
 1 file changed, 56 insertions(+), 45 deletions(-)

diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/iio/light/al3320a.c
+++ b/drivers/iio/light/al3320a.c
@@ -XXX,XX +XXX,XX @@
 #include <linux/bitfield.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
+#include <linux/regmap.h>
 #include <linux/mod_devicetable.h>
 
 #include <linux/iio/iio.h>
@@ -XXX,XX +XXX,XX @@ static const int al3320a_scales[][2] = {
 	{0, 512000}, {0, 128000}, {0, 32000}, {0, 10000}
 };
 
+static const struct regmap_config al3320a_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+	.max_register = AL3320A_REG_HIGH_THRESH_HIGH,
+};
+
 struct al3320a_data {
-	struct i2c_client *client;
+	struct regmap *regmap;
 };
 
 static const struct iio_chan_spec al3320a_channels[] = {
@@ -XXX,XX +XXX,XX @@ static const struct attribute_group al3320a_attribute_group = {
 	.attrs = al3320a_attributes,
 };
 
-static int al3320a_set_pwr(struct i2c_client *client, bool pwr)
+static int al3320a_set_pwr_on(struct al3320a_data *data)
 {
-	u8 val = pwr ? AL3320A_CONFIG_ENABLE : AL3320A_CONFIG_DISABLE;
-	return i2c_smbus_write_byte_data(client, AL3320A_REG_CONFIG, val);
+	return regmap_write(data->regmap, AL3320A_REG_CONFIG, AL3320A_CONFIG_ENABLE);
 }
 
 static void al3320a_set_pwr_off(void *_data)
 {
 	struct al3320a_data *data = _data;
+	struct device *dev = regmap_get_device(data->regmap);
+	int ret;
 
-	al3320a_set_pwr(data->client, false);
+	ret = regmap_write(data->regmap, AL3320A_REG_CONFIG, AL3320A_CONFIG_DISABLE);
+	if (ret)
+		dev_err(dev, "failed to write system register\n");
 }
 
 static int al3320a_init(struct al3320a_data *data)
 {
 	int ret;
 
-	ret = al3320a_set_pwr(data->client, true);
-
-	if (ret < 0)
+	ret = al3320a_set_pwr_on(data);
+	if (ret)
 		return ret;
 
-	ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG_RANGE,
-					FIELD_PREP(AL3320A_GAIN_MASK,
-						   AL3320A_RANGE_3));
-	if (ret < 0)
-		return ret;
-
-	ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_MEAN_TIME,
-					AL3320A_DEFAULT_MEAN_TIME);
-	if (ret < 0)
+	ret = regmap_write(data->regmap, AL3320A_REG_CONFIG_RANGE,
+			   FIELD_PREP(AL3320A_GAIN_MASK, AL3320A_RANGE_3));
+	if (ret)
 		return ret;
 
-	ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_WAIT,
-					AL3320A_DEFAULT_WAIT_TIME);
-	if (ret < 0)
+	ret = regmap_write(data->regmap, AL3320A_REG_MEAN_TIME,
+			   AL3320A_DEFAULT_MEAN_TIME);
+	if (ret)
 		return ret;
 
-	return 0;
+	return regmap_write(data->regmap, AL3320A_REG_WAIT,
+			    AL3320A_DEFAULT_WAIT_TIME);
 }
 
 static int al3320a_read_raw(struct iio_dev *indio_dev,
@@ -XXX,XX +XXX,XX @@ static int al3320a_read_raw(struct iio_dev *indio_dev,
 			    int *val2, long mask)
 {
 	struct al3320a_data *data = iio_priv(indio_dev);
-	int ret;
+	int ret, value;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
@@ -XXX,XX +XXX,XX @@ static int al3320a_read_raw(struct iio_dev *indio_dev,
 		 * - low byte of output is stored at AL3320A_REG_DATA_LOW
 		 * - high byte of output is stored at AL3320A_REG_DATA_LOW + 1
 		 */
-		ret = i2c_smbus_read_word_data(data->client,
-					       AL3320A_REG_DATA_LOW);
-		if (ret < 0)
+		ret = regmap_read(data->regmap, AL3320A_REG_DATA_LOW, &value);
+		if (ret)
 			return ret;
-		*val = ret;
+
+		*val = value;
+
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		ret = i2c_smbus_read_byte_data(data->client,
-					       AL3320A_REG_CONFIG_RANGE);
-		if (ret < 0)
+		ret = regmap_read(data->regmap, AL3320A_REG_CONFIG_RANGE, &value);
+		if (ret)
 			return ret;
 
-		ret = FIELD_GET(AL3320A_GAIN_MASK, ret);
-		*val = al3320a_scales[ret][0];
-		*val2 = al3320a_scales[ret][1];
+		value = FIELD_GET(AL3320A_GAIN_MASK, value);
+		*val = al3320a_scales[value][0];
+		*val2 = al3320a_scales[value][1];
 
 		return IIO_VAL_INT_PLUS_MICRO;
 	}
@@ -XXX,XX +XXX,XX @@ static int al3320a_write_raw(struct iio_dev *indio_dev,
 			     int val2, long mask)
 {
 	struct al3320a_data *data = iio_priv(indio_dev);
-	int i;
+	unsigned int i;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_SCALE:
@@ -XXX,XX +XXX,XX @@ static int al3320a_write_raw(struct iio_dev *indio_dev,
 			    val2 != al3320a_scales[i][1])
 				continue;
 
-			return i2c_smbus_write_byte_data(data->client,
-					AL3320A_REG_CONFIG_RANGE,
-					FIELD_PREP(AL3320A_GAIN_MASK, i));
+			return regmap_write(data->regmap, AL3320A_REG_CONFIG_RANGE,
+					    FIELD_PREP(AL3320A_GAIN_MASK, i));
 		}
 		break;
 	}
@@ -XXX,XX +XXX,XX @@ static const struct iio_info al3320a_info = {
 static int al3320a_probe(struct i2c_client *client)
 {
 	struct al3320a_data *data;
+	struct device *dev = &client->dev;
 	struct iio_dev *indio_dev;
 	int ret;
 
-	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+	indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
 	if (!indio_dev)
 		return -ENOMEM;
 
 	data = iio_priv(indio_dev);
 	i2c_set_clientdata(client, indio_dev);
-	data->client = client;
+
+	data->regmap = devm_regmap_init_i2c(client, &al3320a_regmap_config);
+	if (IS_ERR(data->regmap))
+		return dev_err_probe(dev, PTR_ERR(data->regmap),
+				     "cannot allocate regmap\n");
 
 	indio_dev->info = &al3320a_info;
 	indio_dev->name = AL3320A_DRV_NAME;
@@ -XXX,XX +XXX,XX @@ static int al3320a_probe(struct i2c_client *client)
 
 	ret = al3320a_init(data);
 	if (ret < 0) {
-		dev_err(&client->dev, "al3320a chip init failed\n");
+		dev_err(dev, "failed to init ALS\n");
 		return ret;
 	}
 
-	ret = devm_add_action_or_reset(&client->dev,
-					al3320a_set_pwr_off,
-					data);
+	ret = devm_add_action_or_reset(dev, al3320a_set_pwr_off, data);
 	if (ret < 0)
 		return ret;
 
-	return devm_iio_device_register(&client->dev, indio_dev);
+	return devm_iio_device_register(dev, indio_dev);
 }
 
 static int al3320a_suspend(struct device *dev)
 {
-	return al3320a_set_pwr(to_i2c_client(dev), false);
+	struct al3320a_data *data = iio_priv(dev_get_drvdata(dev));
+
+	al3320a_set_pwr_off(data);
+	return 0;
 }
 
 static int al3320a_resume(struct device *dev)
 {
-	return al3320a_set_pwr(to_i2c_client(dev), true);
+	struct al3320a_data *data = iio_priv(dev_get_drvdata(dev));
+
+	return al3320a_set_pwr_on(data);
 }
 
 static DEFINE_SIMPLE_DEV_PM_OPS(al3320a_pm_ops, al3320a_suspend,

-- 
2.47.2

This series aims to improve code readability and modernize it to align
with the recently upstreamed AL3000a.

Apart from slightly improved error reporting, and error handling
there should be no functional changes.

Module  before after
al3010  72 kB  58 kB
al3320a 72 kB  58 kB

Signed-off-by: David Heidelberg <david@ixit.cz>
---
Changes in v4:
- Fixed mixed-up rebase changes between commits and added
  regmap_get_device into _init functions to get the device.
- Link to v3: https://lore.kernel.org/r/20250402-al3010-iio-regmap-v3-0-cc3da273b5b2@ixit.cz

Changes in v3:
- Stripped patches merged from second version of patchset.
- Dropped iio: light: al3010: Move devm_add_action_or_reset back to _probe
  in favor of opposite approach moving devm_add.. to _init for al3xx0a:
  - iio: light: al3000a: Fix an error handling path in al3000a_probe()
  - iio: light: al3320a: Fix an error handling path in al3320a_probe()
- Link to v2: https://lore.kernel.org/r/20250319-al3010-iio-regmap-v2-0-1310729d0543@ixit.cz

Changes in v2:
- Dropped Daniel's email update.
- Dropped DRV_NAME introduction for al3000a
- Added DRV_NAME define removal for al3010 and al3320a.
- Splitted unsigned int conversion into separate patches.
- Replaced generic value with specific raw and gain variable.
- Use dev_err_probe() for error handling.
- Separated devm_add_action_or_reset move from _init back to _probe.
- Dropped copyright update.
- Link to v1: https://lore.kernel.org/r/20250308-al3010-iio-regmap-v1-0-b672535e8213@ixit.cz

---
David Heidelberg (5):
      iio: light: al3010: Improve al3010_init error handling with dev_err_probe()
      iio: light: al3000a: Fix an error handling path in al3000a_probe()
      iio: light: al3320a: Fix an error handling path in al3320a_probe()
      iio: light: al3010: Implement regmap support
      iio: light: al3320a: Implement regmap support

drivers/iio/light/al3000a.c |  9 +++--
 drivers/iio/light/al3010.c  | 85 +++++++++++++++++++++++--------------------
 drivers/iio/light/al3320a.c | 89 +++++++++++++++++++++++++--------------------
 3 files changed, 100 insertions(+), 83 deletions(-)
---
base-commit: f8ffc92ae9052e6615896052f0c5b808bfc17520
change-id: 20250308-al3010-iio-regmap-038cea39f85d

Best regards,
-- 
David Heidelberg <david@ixit.cz>

From: David Heidelberg <david@ixit.cz>

Minor code simplifications and improved error reporting.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 drivers/iio/light/al3010.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/iio/light/al3010.c b/drivers/iio/light/al3010.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/iio/light/al3010.c
+++ b/drivers/iio/light/al3010.c
@@ -XXX,XX +XXX,XX @@ static int al3010_init(struct al3010_data *data)
 	ret = devm_add_action_or_reset(&data->client->dev,
 				       al3010_set_pwr_off,
 				       data);
-	if (ret < 0)
-		return ret;
+	if (ret)
+		return dev_err_probe(&data->client->dev, ret, "failed to add action\n");
 
 	ret = i2c_smbus_write_byte_data(data->client, AL3010_REG_CONFIG,
 					FIELD_PREP(AL3010_GAIN_MASK,
@@ -XXX,XX +XXX,XX @@ static int al3010_probe(struct i2c_client *client)
 	indio_dev->modes = INDIO_DIRECT_MODE;
 
 	ret = al3010_init(data);
-	if (ret < 0) {
-		dev_err(dev, "al3010 chip init failed\n");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(dev, ret, "failed to init ALS\n");
 
 	return devm_iio_device_register(dev, indio_dev);
 }

-- 
2.49.0

From: David Heidelberg <david@ixit.cz>

If regmap_write() fails in al3000a_init(), al3000a_set_pwr_off is
not called.

In order to avoid such a situation, move the devm_add_action_or_reset()
which calls al3000a_set_pwr_off right after a successful
al3000a_set_pwr_on.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 drivers/iio/light/al3000a.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/light/al3000a.c b/drivers/iio/light/al3000a.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/iio/light/al3000a.c
+++ b/drivers/iio/light/al3000a.c
@@ -XXX,XX +XXX,XX @@ static void al3000a_set_pwr_off(void *_data)
 
 static int al3000a_init(struct al3000a_data *data)
 {
+	struct device *dev = regmap_get_device(data->regmap);
 	int ret;
 
 	ret = al3000a_set_pwr_on(data);
 	if (ret)
 		return ret;
 
+	ret = devm_add_action_or_reset(dev, al3000a_set_pwr_off, data);
+	if (ret)
+		return dev_err_probe(dev, ret, "failed to add action\n");
+
 	ret = regmap_write(data->regmap, AL3000A_REG_SYSTEM, AL3000A_CONFIG_RESET);
 	if (ret)
 		return ret;
@@ -XXX,XX +XXX,XX @@ static int al3000a_probe(struct i2c_client *client)
 	if (ret)
 		return dev_err_probe(dev, ret, "failed to init ALS\n");
 
-	ret = devm_add_action_or_reset(dev, al3000a_set_pwr_off, data);
-	if (ret)
-		return dev_err_probe(dev, ret, "failed to add action\n");
-
 	return devm_iio_device_register(dev, indio_dev);
 }

-- 
2.49.0

From: David Heidelberg <david@ixit.cz>

If regmap_write() fails in al3320a_init(), al3320a_set_pwr_off is
not called.

In order to avoid such a situation, move the devm_add_action_or_reset()
which calls al3320a_set_pwr_off right after a successful
al3320a_set_pwr_on.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 drivers/iio/light/al3320a.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/iio/light/al3320a.c
+++ b/drivers/iio/light/al3320a.c
@@ -XXX,XX +XXX,XX @@ static int al3320a_init(struct al3320a_data *data)
 	if (ret < 0)
 		return ret;
 
+	ret = devm_add_action_or_reset(&data->client->dev,
+				       al3320a_set_pwr_off,
+				       data);
+	if (ret)
+		return dev_err_probe(&data->client->dev, ret, "failed to add action\n");
+
 	ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG_RANGE,
 					FIELD_PREP(AL3320A_GAIN_MASK,
 						   AL3320A_RANGE_3));
@@ -XXX,XX +XXX,XX @@ static int al3320a_probe(struct i2c_client *client)
 		return ret;
 	}
 
-	ret = devm_add_action_or_reset(dev, al3320a_set_pwr_off, data);
-	if (ret < 0)
-		return ret;
-
 	return devm_iio_device_register(dev, indio_dev);
 }

-- 
2.49.0

From: David Heidelberg <david@ixit.cz>

Modernize and clean up the driver using the regmap framework.

With the regmap implementation, the compiler produces
a significantly smaller module.

Size before: 72 kB
Size after:  58 kB

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 drivers/iio/light/al3010.c | 77 +++++++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 35 deletions(-)

diff --git a/drivers/iio/light/al3010.c b/drivers/iio/light/al3010.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/iio/light/al3010.c
+++ b/drivers/iio/light/al3010.c
@@ -XXX,XX +XXX,XX @@
 #include <linux/bitfield.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
+#include <linux/regmap.h>
 #include <linux/mod_devicetable.h>
 
 #include <linux/iio/iio.h>
@@ -XXX,XX +XXX,XX @@ static const int al3010_scales[][2] = {
 	{0, 1187200}, {0, 296800}, {0, 74200}, {0, 18600}
 };
 
+static const struct regmap_config al3010_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+	.max_register = AL3010_REG_CONFIG,
+};
+
 struct al3010_data {
-	struct i2c_client *client;
+	struct regmap *regmap;
 };
 
 static const struct iio_chan_spec al3010_channels[] = {
@@ -XXX,XX +XXX,XX @@ static const struct attribute_group al3010_attribute_group = {
 	.attrs = al3010_attributes,
 };
 
-static int al3010_set_pwr_on(struct i2c_client *client)
+static int al3010_set_pwr_on(struct al3010_data *data)
 {
-	return i2c_smbus_write_byte_data(client, AL3010_REG_SYSTEM,
-					 AL3010_CONFIG_ENABLE);
+	return regmap_write(data->regmap, AL3010_REG_SYSTEM, AL3010_CONFIG_ENABLE);
 }
 
 static void al3010_set_pwr_off(void *_data)
 {
 	struct al3010_data *data = _data;
+	struct device *dev = regmap_get_device(data->regmap);
+	int ret;
 
-	i2c_smbus_write_byte_data(data->client, AL3010_REG_SYSTEM,
-				  AL3010_CONFIG_DISABLE);
+	ret = regmap_write(data->regmap, AL3010_REG_SYSTEM, AL3010_CONFIG_DISABLE);
+	if (ret)
+		dev_err(dev, "failed to write system register\n");
 }
 
 static int al3010_init(struct al3010_data *data)
 {
+	struct device *dev = regmap_get_device(data->regmap);
 	int ret;
 
-	ret = al3010_set_pwr_on(data->client);
-	if (ret < 0)
+	ret = al3010_set_pwr_on(data);
+	if (ret)
 		return ret;
 
-	ret = devm_add_action_or_reset(&data->client->dev,
-				       al3010_set_pwr_off,
-				       data);
+	ret = devm_add_action_or_reset(dev, al3010_set_pwr_off, data);
 	if (ret)
-		return dev_err_probe(&data->client->dev, ret, "failed to add action\n");
-
-	ret = i2c_smbus_write_byte_data(data->client, AL3010_REG_CONFIG,
-					FIELD_PREP(AL3010_GAIN_MASK,
-						   AL3XXX_RANGE_3));
-	if (ret < 0)
-		return ret;
+		return dev_err_probe(dev, ret, "failed to add action\n");
 
-	return 0;
+	return regmap_write(data->regmap, AL3010_REG_CONFIG,
+			    FIELD_PREP(AL3010_GAIN_MASK, AL3XXX_RANGE_3));
 }
 
 static int al3010_read_raw(struct iio_dev *indio_dev,
@@ -XXX,XX +XXX,XX @@ static int al3010_read_raw(struct iio_dev *indio_dev,
 			   int *val2, long mask)
 {
 	struct al3010_data *data = iio_priv(indio_dev);
-	int ret;
+	int ret, gain, raw;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
@@ -XXX,XX +XXX,XX @@ static int al3010_read_raw(struct iio_dev *indio_dev,
 		 * - low byte of output is stored at AL3010_REG_DATA_LOW
 		 * - high byte of output is stored at AL3010_REG_DATA_LOW + 1
 		 */
-		ret = i2c_smbus_read_word_data(data->client,
-					       AL3010_REG_DATA_LOW);
-		if (ret < 0)
+		ret = regmap_read(data->regmap, AL3010_REG_DATA_LOW, &raw);
+		if (ret)
 			return ret;
-		*val = ret;
+
+		*val = raw;
+
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		ret = i2c_smbus_read_byte_data(data->client,
-					       AL3010_REG_CONFIG);
-		if (ret < 0)
+		ret = regmap_read(data->regmap, AL3010_REG_CONFIG, &gain);
+		if (ret)
 			return ret;
 
-		ret = FIELD_GET(AL3010_GAIN_MASK, ret);
-		*val = al3010_scales[ret][0];
-		*val2 = al3010_scales[ret][1];
+		gain = FIELD_GET(AL3010_GAIN_MASK, gain);
+		*val = al3010_scales[gain][0];
+		*val2 = al3010_scales[gain][1];
 
 		return IIO_VAL_INT_PLUS_MICRO;
 	}
@@ -XXX,XX +XXX,XX @@ static int al3010_write_raw(struct iio_dev *indio_dev,
 			    val2 != al3010_scales[i][1])
 				continue;
 
-			return i2c_smbus_write_byte_data(data->client,
-					AL3010_REG_CONFIG,
-					FIELD_PREP(AL3010_GAIN_MASK, i));
+			return regmap_write(data->regmap, AL3010_REG_CONFIG,
+					    FIELD_PREP(AL3010_GAIN_MASK, i));
 		}
 		break;
 	}
@@ -XXX,XX +XXX,XX @@ static int al3010_probe(struct i2c_client *client)
 
 	data = iio_priv(indio_dev);
 	i2c_set_clientdata(client, indio_dev);
-	data->client = client;
+	data->regmap = devm_regmap_init_i2c(client, &al3010_regmap_config);
+	if (IS_ERR(data->regmap))
+		return dev_err_probe(dev, PTR_ERR(data->regmap),
+				     "cannot allocate regmap\n");
 
 	indio_dev->info = &al3010_info;
 	indio_dev->name = "al3010";
@@ -XXX,XX +XXX,XX @@ static int al3010_suspend(struct device *dev)
 
 static int al3010_resume(struct device *dev)
 {
-	return al3010_set_pwr_on(to_i2c_client(dev));
+	struct al3010_data *data = iio_priv(dev_get_drvdata(dev));
+
+	return al3010_set_pwr_on(data);
 }
 
 static DEFINE_SIMPLE_DEV_PM_OPS(al3010_pm_ops, al3010_suspend, al3010_resume);

-- 
2.49.0

From: David Heidelberg <david@ixit.cz>

Modernize and clean up the driver using the regmap framework.

With the regmap implementation, the compiler produces
a significantly smaller module.

Size before: 72 kB
Size after:  58 kB

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 drivers/iio/light/al3320a.c | 89 +++++++++++++++++++++++++--------------------
 1 file changed, 49 insertions(+), 40 deletions(-)

diff --git a/drivers/iio/light/al3320a.c b/drivers/iio/light/al3320a.c
index XXXXXXX..XXXXXXX 100644
--- a/drivers/iio/light/al3320a.c
+++ b/drivers/iio/light/al3320a.c
@@ -XXX,XX +XXX,XX @@
 #include <linux/bitfield.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
+#include <linux/regmap.h>
 #include <linux/mod_devicetable.h>
 
 #include <linux/iio/iio.h>
@@ -XXX,XX +XXX,XX @@ static const int al3320a_scales[][2] = {
 	{0, 512000}, {0, 128000}, {0, 32000}, {0, 10000}
 };
 
+static const struct regmap_config al3320a_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+	.max_register = AL3320A_REG_HIGH_THRESH_HIGH,
+};
+
 struct al3320a_data {
-	struct i2c_client *client;
+	struct regmap *regmap;
 };
 
 static const struct iio_chan_spec al3320a_channels[] = {
@@ -XXX,XX +XXX,XX @@ static const struct attribute_group al3320a_attribute_group = {
 	.attrs = al3320a_attributes,
 };
 
-static int al3320a_set_pwr_on(struct i2c_client *client)
+static int al3320a_set_pwr_on(struct al3320a_data *data)
 {
-	return i2c_smbus_write_byte_data(client, AL3320A_REG_CONFIG, AL3320A_CONFIG_ENABLE);
+	return regmap_write(data->regmap, AL3320A_REG_CONFIG, AL3320A_CONFIG_ENABLE);
 }
 
 static void al3320a_set_pwr_off(void *_data)
 {
 	struct al3320a_data *data = _data;
+	struct device *dev = regmap_get_device(data->regmap);
+	int ret;
 
-	i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG, AL3320A_CONFIG_DISABLE);
+	ret = regmap_write(data->regmap, AL3320A_REG_CONFIG, AL3320A_CONFIG_DISABLE);
+	if (ret)
+		dev_err(dev, "failed to write system register\n");
 }
 
 static int al3320a_init(struct al3320a_data *data)
 {
+	struct device *dev = regmap_get_device(data->regmap);
 	int ret;
 
-	ret = al3320a_set_pwr_on(data->client);
-
-	if (ret < 0)
+	ret = al3320a_set_pwr_on(data);
+	if (ret)
 		return ret;
 
-	ret = devm_add_action_or_reset(&data->client->dev,
-				       al3320a_set_pwr_off,
-				       data);
+	ret = devm_add_action_or_reset(dev, al3320a_set_pwr_off, data);
 	if (ret)
-		return dev_err_probe(&data->client->dev, ret, "failed to add action\n");
-
-	ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_CONFIG_RANGE,
-					FIELD_PREP(AL3320A_GAIN_MASK,
-						   AL3320A_RANGE_3));
-	if (ret < 0)
-		return ret;
+		return dev_err_probe(dev, ret, "failed to add action\n");
 
-	ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_MEAN_TIME,
-					AL3320A_DEFAULT_MEAN_TIME);
-	if (ret < 0)
+	ret = regmap_write(data->regmap, AL3320A_REG_CONFIG_RANGE,
+			   FIELD_PREP(AL3320A_GAIN_MASK, AL3320A_RANGE_3));
+	if (ret)
 		return ret;
 
-	ret = i2c_smbus_write_byte_data(data->client, AL3320A_REG_WAIT,
-					AL3320A_DEFAULT_WAIT_TIME);
-	if (ret < 0)
+	ret = regmap_write(data->regmap, AL3320A_REG_MEAN_TIME,
+			   AL3320A_DEFAULT_MEAN_TIME);
+	if (ret)
 		return ret;
 
-	return 0;
+	return regmap_write(data->regmap, AL3320A_REG_WAIT,
+			    AL3320A_DEFAULT_WAIT_TIME);
 }
 
 static int al3320a_read_raw(struct iio_dev *indio_dev,
@@ -XXX,XX +XXX,XX @@ static int al3320a_read_raw(struct iio_dev *indio_dev,
 			    int *val2, long mask)
 {
 	struct al3320a_data *data = iio_priv(indio_dev);
-	int ret;
+	int ret, gain, raw;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
@@ -XXX,XX +XXX,XX @@ static int al3320a_read_raw(struct iio_dev *indio_dev,
 		 * - low byte of output is stored at AL3320A_REG_DATA_LOW
 		 * - high byte of output is stored at AL3320A_REG_DATA_LOW + 1
 		 */
-		ret = i2c_smbus_read_word_data(data->client,
-					       AL3320A_REG_DATA_LOW);
-		if (ret < 0)
+		ret = regmap_read(data->regmap, AL3320A_REG_DATA_LOW, &raw);
+		if (ret)
 			return ret;
-		*val = ret;
+
+		*val = raw;
+
 		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		ret = i2c_smbus_read_byte_data(data->client,
-					       AL3320A_REG_CONFIG_RANGE);
-		if (ret < 0)
+		ret = regmap_read(data->regmap, AL3320A_REG_CONFIG_RANGE, &gain);
+		if (ret)
 			return ret;
 
-		ret = FIELD_GET(AL3320A_GAIN_MASK, ret);
-		*val = al3320a_scales[ret][0];
-		*val2 = al3320a_scales[ret][1];
+		gain = FIELD_GET(AL3320A_GAIN_MASK, gain);
+		*val = al3320a_scales[gain][0];
+		*val2 = al3320a_scales[gain][1];
 
 		return IIO_VAL_INT_PLUS_MICRO;
 	}
@@ -XXX,XX +XXX,XX @@ static int al3320a_write_raw(struct iio_dev *indio_dev,
 			    val2 != al3320a_scales[i][1])
 				continue;
 
-			return i2c_smbus_write_byte_data(data->client,
-					AL3320A_REG_CONFIG_RANGE,
-					FIELD_PREP(AL3320A_GAIN_MASK, i));
+			return regmap_write(data->regmap, AL3320A_REG_CONFIG_RANGE,
+					    FIELD_PREP(AL3320A_GAIN_MASK, i));
 		}
 		break;
 	}
@@ -XXX,XX +XXX,XX @@ static int al3320a_probe(struct i2c_client *client)
 
 	data = iio_priv(indio_dev);
 	i2c_set_clientdata(client, indio_dev);
-	data->client = client;
+
+	data->regmap = devm_regmap_init_i2c(client, &al3320a_regmap_config);
+	if (IS_ERR(data->regmap))
+		return dev_err_probe(dev, PTR_ERR(data->regmap),
+				     "cannot allocate regmap\n");
 
 	indio_dev->info = &al3320a_info;
 	indio_dev->name = "al3320a";
@@ -XXX,XX +XXX,XX @@ static int al3320a_suspend(struct device *dev)
 
 static int al3320a_resume(struct device *dev)
 {
-	return al3320a_set_pwr_on(to_i2c_client(dev));
+	struct al3320a_data *data = iio_priv(dev_get_drvdata(dev));
+
+	return al3320a_set_pwr_on(data);
 }
 
 static DEFINE_SIMPLE_DEV_PM_OPS(al3320a_pm_ops, al3320a_suspend,

-- 
2.49.0