iio: pressure: bmp280: Add more intuitive name for bmp180_measure()

The bmp180_measure() function essentially waits for the end of the
current conversion in order to read the values from the sensors. The
name bmp180_measure() could be misinterpreted because it could be
translated as "measure sensor values" even though it was probably
trying to say "measure time for eoc". Give a more intuitive name
to this function to be less confusing.

Signed-off-by: Vasileios Amoiridis <vassilisamir@gmail.com>
Link: https://lore.kernel.org/r/20240429190046.24252-5-vassilisamir@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 edfa66953f87a35387a46afbd2fb79089941a5f0..ed49e0779d417b8d7c648c33f7f4ffd8f9f613e9 100644 (file)
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -1771,7 +1771,7 @@ const struct bmp280_chip_info bmp580_chip_info = {
 };
 EXPORT_SYMBOL_NS(bmp580_chip_info, IIO_BMP280);
 
-static int bmp180_measure(struct bmp280_data *data, u8 ctrl_meas)
+static int bmp180_wait_for_eoc(struct bmp280_data *data, u8 ctrl_meas)
 {
        const int conversion_time_max[] = { 4500, 7500, 13500, 25500 };
        unsigned int delay_us;
@@ -1820,9 +1820,9 @@ static int bmp180_read_adc_temp(struct bmp280_data *data, int *val)
 {
        int ret;
 
-       ret = bmp180_measure(data,
-                            FIELD_PREP(BMP180_MEAS_CTRL_MASK, BMP180_MEAS_TEMP) |
-                            BMP180_MEAS_SCO);
+       ret = bmp180_wait_for_eoc(data,
+                                 FIELD_PREP(BMP180_MEAS_CTRL_MASK, BMP180_MEAS_TEMP) |
+                                 BMP180_MEAS_SCO);
        if (ret)
                return ret;
 
@@ -1920,10 +1920,10 @@ static int bmp180_read_adc_press(struct bmp280_data *data, int *val)
        u8 oss = data->oversampling_press;
        int ret;
 
-       ret = bmp180_measure(data,
-                            FIELD_PREP(BMP180_MEAS_CTRL_MASK, BMP180_MEAS_PRESS) |
-                            FIELD_PREP(BMP180_OSRS_PRESS_MASK, oss) |
-                            BMP180_MEAS_SCO);
+       ret = bmp180_wait_for_eoc(data,
+                                 FIELD_PREP(BMP180_MEAS_CTRL_MASK, BMP180_MEAS_PRESS) |
+                                 FIELD_PREP(BMP180_OSRS_PRESS_MASK, oss) |
+                                 BMP180_MEAS_SCO);
        if (ret)
                return ret;