iio: pressure: bmp280: Add preinit callback

Adds preinit callback to execute operations on probe before applying
initial configuration.

Signed-off-by: Angel Iglesias <ang.iglesiasg@gmail.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/fa9513ffad37a6a43b6d46df9d8319ccab6f5870.1676823250.git.ang.iglesiasg@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 2c8773db4b73ce1c1a66dbfe9d696a6fcb6d06f3..6467034b1d3e689ac65824639b08b23d1f240e66 100644 (file)
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -1076,6 +1076,12 @@ static const int bmp380_odr_table[][2] = {
        [BMP380_ODR_0_0015HZ]   = {0, 1526},
 };
 
+static int bmp380_preinit(struct bmp280_data *data)
+{
+       /* BMP3xx requires soft-reset as part of initialization */
+       return bmp380_cmd(data, BMP380_CMD_SOFT_RESET);
+}
+
 static int bmp380_chip_config(struct bmp280_data *data)
 {
        bool change = false, aux;
@@ -1206,6 +1212,7 @@ const struct bmp280_chip_info bmp380_chip_info = {
        .read_temp = bmp380_read_temp,
        .read_press = bmp380_read_press,
        .read_calib = bmp380_read_calib,
+       .preinit = bmp380_preinit,
 };
 EXPORT_SYMBOL_NS(bmp380_chip_info, IIO_BMP280);
 
@@ -1605,11 +1612,11 @@ int bmp280_common_probe(struct device *dev,
                return -EINVAL;
        }
 
-       /* BMP3xx requires soft-reset as part of initialization */
-       if (chip_id == BMP380_CHIP_ID) {
-               ret = bmp380_cmd(data, BMP380_CMD_SOFT_RESET);
-               if (ret < 0)
-                       return ret;
+       if (data->chip_info->preinit) {
+               ret = data->chip_info->preinit(data);
+               if (ret)
+                       return dev_err_probe(data->dev, ret,
+                                            "error running preinit tasks\n");
        }
 
        ret = data->chip_info->chip_config(data);

diff --git a/drivers/iio/pressure/bmp280.h b/drivers/iio/pressure/bmp280.h
index 387723fd07728fa8747c29ac62f8569df1a4aa7c..be17104ef0a230ec81690048164bae138cb9427b 100644 (file)
--- a/drivers/iio/pressure/bmp280.h
+++ b/drivers/iio/pressure/bmp280.h
@@ -345,6 +345,7 @@ struct bmp280_chip_info {
        int (*read_press)(struct bmp280_data *, int *, int *);
        int (*read_humid)(struct bmp280_data *, int *, int *);
        int (*read_calib)(struct bmp280_data *);
+       int (*preinit)(struct bmp280_data *);
 };
 
 /* Chip infos for each variant */