iio: accel: adxl345: Reorder probe initialization

Bring indio_dev, setup() and data initialization to begin of the probe()
function to increase readability. Access members through data
pointer to assure implicitely the driver's data instance is correctly
initialized and functional.

Signed-off-by: Lothar Rubusch <l.rubusch@gmail.com>
Link: https://lore.kernel.org/r/20240401194906.56810-7-l.rubusch@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c
index 8d4a66d8c528fa3816ffbc3f12161d1c8d582c5e..5d0f3243ec6c94e4370aea7710931d9720f8de49 100644 (file)
--- a/drivers/iio/accel/adxl345_core.c
+++ b/drivers/iio/accel/adxl345_core.c
@@ -180,14 +180,30 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap,
                                         ADXL345_DATA_FORMAT_SELF_TEST);
        int ret;
 
+       indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
+       if (!indio_dev)
+               return -ENOMEM;
+
+       data = iio_priv(indio_dev);
+       data->regmap = regmap;
+       data->info = device_get_match_data(dev);
+       if (!data->info)
+               return -ENODEV;
+
+       indio_dev->name = data->info->name;
+       indio_dev->info = &adxl345_info;
+       indio_dev->modes = INDIO_DIRECT_MODE;
+       indio_dev->channels = adxl345_channels;
+       indio_dev->num_channels = ARRAY_SIZE(adxl345_channels);
+
        if (setup) {
                /* Perform optional initial bus specific configuration */
-               ret = setup(dev, regmap);
+               ret = setup(dev, data->regmap);
                if (ret)
                        return ret;
 
                /* Enable full-resolution mode */
-               ret = regmap_update_bits(regmap, ADXL345_REG_DATA_FORMAT,
+               ret = regmap_update_bits(data->regmap, ADXL345_REG_DATA_FORMAT,
                                         data_format_mask,
                                         ADXL345_DATA_FORMAT_FULL_RES);
                if (ret)
@@ -196,14 +212,14 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap,
 
        } else {
                /* Enable full-resolution mode (init all data_format bits) */
-               ret = regmap_write(regmap, ADXL345_REG_DATA_FORMAT,
+               ret = regmap_write(data->regmap, ADXL345_REG_DATA_FORMAT,
                                   ADXL345_DATA_FORMAT_FULL_RES);
                if (ret)
                        return dev_err_probe(dev, ret,
                                             "Failed to set data range\n");
        }
 
-       ret = regmap_read(regmap, ADXL345_REG_DEVID, &regval);
+       ret = regmap_read(data->regmap, ADXL345_REG_DEVID, &regval);
        if (ret < 0)
                return dev_err_probe(dev, ret, "Error reading device ID\n");
 
@@ -211,22 +227,6 @@ int adxl345_core_probe(struct device *dev, struct regmap *regmap,
                return dev_err_probe(dev, -ENODEV, "Invalid device ID: %x, expected %x\n",
                                     regval, ADXL345_DEVID);
 
-       indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
-       if (!indio_dev)
-               return -ENOMEM;
-
-       data = iio_priv(indio_dev);
-       data->regmap = regmap;
-       data->info = device_get_match_data(dev);
-       if (!data->info)
-               return -ENODEV;
-
-       indio_dev->name = data->info->name;
-       indio_dev->info = &adxl345_info;
-       indio_dev->modes = INDIO_DIRECT_MODE;
-       indio_dev->channels = adxl345_channels;
-       indio_dev->num_channels = ARRAY_SIZE(adxl345_channels);
-
        /* Enable measurement mode */
        ret = adxl345_powerup(data->regmap);
        if (ret < 0)