[PATCH 1/7] iio:imu: changed structure name from st_sensors to st_sensor_settings

[PATCH 1/7] iio:imu: changed structure name from st_sensors to st_sensor_settings

[Denis CIOCCA]

This patch change structure name and related variables names.

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
---
 drivers/iio/accel/st_accel_core.c               |  13 +--
 drivers/iio/common/st_sensors/st_sensors_core.c | 126 +++++++++++++-----------
 drivers/iio/gyro/st_gyro_core.c                 |  13 +--
 drivers/iio/magnetometer/st_magn_core.c         |  13 +--
 drivers/iio/pressure/st_pressure_core.c         |  20 ++--
 include/linux/iio/common/st_sensors.h           |  10 +-
 6 files changed, 104 insertions(+), 91 deletions(-)

diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 0878648..7cbdfae 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -161,7 +161,7 @@ static const struct iio_chan_spec st_accel_16bit_channels[] = {
 	IIO_CHAN_SOFT_TIMESTAMP(3)
 };
 
-static const struct st_sensors st_accel_sensors[] = {
+static const struct st_sensor_settings st_accel_sensors_settings[] = {
 	{
 		.wai = ST_ACCEL_1_WAI_EXP,
 		.sensors_supported = {
@@ -470,18 +470,19 @@ int st_accel_common_probe(struct iio_dev *indio_dev,
 	st_sensors_power_enable(indio_dev);
 
 	err = st_sensors_check_device_support(indio_dev,
-				ARRAY_SIZE(st_accel_sensors), st_accel_sensors);
+					ARRAY_SIZE(st_accel_sensors_settings),
+					st_accel_sensors_settings);
 	if (err < 0)
 		return err;
 
 	adata->num_data_channels = ST_ACCEL_NUMBER_DATA_CHANNELS;
-	adata->multiread_bit = adata->sensor->multi_read_bit;
-	indio_dev->channels = adata->sensor->ch;
+	adata->multiread_bit = adata->sensor_settings->multi_read_bit;
+	indio_dev->channels = adata->sensor_settings->ch;
 	indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
 
 	adata->current_fullscale = (struct st_sensor_fullscale_avl *)
-						&adata->sensor->fs.fs_avl[0];
-	adata->odr = adata->sensor->odr.odr_avl[0].hz;
+					&adata->sensor_settings->fs.fs_avl[0];
+	adata->odr = adata->sensor_settings->odr.odr_avl[0].hz;
 
 	if (!plat_data)
 		plat_data =
diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
index 24cfe4e..edd13d2 100644
--- a/drivers/iio/common/st_sensors/st_sensors_core.c
+++ b/drivers/iio/common/st_sensors/st_sensors_core.c
@@ -44,18 +44,18 @@ st_sensors_write_data_with_mask_error:
 	return err;
 }
 
-static int st_sensors_match_odr(struct st_sensors *sensor,
+static int st_sensors_match_odr(struct st_sensor_settings *sensor_settings,
 			unsigned int odr, struct st_sensor_odr_avl *odr_out)
 {
 	int i, ret = -EINVAL;
 
 	for (i = 0; i < ST_SENSORS_ODR_LIST_MAX; i++) {
-		if (sensor->odr.odr_avl[i].hz == 0)
+		if (sensor_settings->odr.odr_avl[i].hz == 0)
 			goto st_sensors_match_odr_error;
 
-		if (sensor->odr.odr_avl[i].hz == odr) {
-			odr_out->hz = sensor->odr.odr_avl[i].hz;
-			odr_out->value = sensor->odr.odr_avl[i].value;
+		if (sensor_settings->odr.odr_avl[i].hz == odr) {
+			odr_out->hz = sensor_settings->odr.odr_avl[i].hz;
+			odr_out->value = sensor_settings->odr.odr_avl[i].value;
 			ret = 0;
 			break;
 		}
@@ -71,23 +71,26 @@ int st_sensors_set_odr(struct iio_dev *indio_dev, unsigned int odr)
 	struct st_sensor_odr_avl odr_out = {0, 0};
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
 
-	err = st_sensors_match_odr(sdata->sensor, odr, &odr_out);
+	err = st_sensors_match_odr(sdata->sensor_settings, odr, &odr_out);
 	if (err < 0)
 		goto st_sensors_match_odr_error;
 
-	if ((sdata->sensor->odr.addr == sdata->sensor->pw.addr) &&
-			(sdata->sensor->odr.mask == sdata->sensor->pw.mask)) {
+	if ((sdata->sensor_settings->odr.addr ==
+					sdata->sensor_settings->pw.addr) &&
+				(sdata->sensor_settings->odr.mask ==
+					sdata->sensor_settings->pw.mask)) {
 		if (sdata->enabled == true) {
 			err = st_sensors_write_data_with_mask(indio_dev,
-				sdata->sensor->odr.addr,
-				sdata->sensor->odr.mask,
+				sdata->sensor_settings->odr.addr,
+				sdata->sensor_settings->odr.mask,
 				odr_out.value);
 		} else {
 			err = 0;
 		}
 	} else {
 		err = st_sensors_write_data_with_mask(indio_dev,
-			sdata->sensor->odr.addr, sdata->sensor->odr.mask,
+			sdata->sensor_settings->odr.addr,
+			sdata->sensor_settings->odr.mask,
 			odr_out.value);
 	}
 	if (err >= 0)
@@ -98,16 +101,16 @@ st_sensors_match_odr_error:
 }
 EXPORT_SYMBOL(st_sensors_set_odr);
 
-static int st_sensors_match_fs(struct st_sensors *sensor,
+static int st_sensors_match_fs(struct st_sensor_settings *sensor_settings,
 					unsigned int fs, int *index_fs_avl)
 {
 	int i, ret = -EINVAL;
 
 	for (i = 0; i < ST_SENSORS_FULLSCALE_AVL_MAX; i++) {
-		if (sensor->fs.fs_avl[i].num == 0)
+		if (sensor_settings->fs.fs_avl[i].num == 0)
 			goto st_sensors_match_odr_error;
 
-		if (sensor->fs.fs_avl[i].num == fs) {
+		if (sensor_settings->fs.fs_avl[i].num == fs) {
 			*index_fs_avl = i;
 			ret = 0;
 			break;
@@ -118,25 +121,24 @@ st_sensors_match_odr_error:
 	return ret;
 }
 
-static int st_sensors_set_fullscale(struct iio_dev *indio_dev,
-								unsigned int fs)
+static int st_sensors_set_fullscale(struct iio_dev *indio_dev, unsigned int fs)
 {
 	int err, i = 0;
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
 
-	err = st_sensors_match_fs(sdata->sensor, fs, &i);
+	err = st_sensors_match_fs(sdata->sensor_settings, fs, &i);
 	if (err < 0)
 		goto st_accel_set_fullscale_error;
 
 	err = st_sensors_write_data_with_mask(indio_dev,
-				sdata->sensor->fs.addr,
-				sdata->sensor->fs.mask,
-				sdata->sensor->fs.fs_avl[i].value);
+				sdata->sensor_settings->fs.addr,
+				sdata->sensor_settings->fs.mask,
+				sdata->sensor_settings->fs.fs_avl[i].value);
 	if (err < 0)
 		goto st_accel_set_fullscale_error;
 
 	sdata->current_fullscale = (struct st_sensor_fullscale_avl *)
-						&sdata->sensor->fs.fs_avl[i];
+					&sdata->sensor_settings->fs.fs_avl[i];
 	return err;
 
 st_accel_set_fullscale_error:
@@ -153,10 +155,12 @@ int st_sensors_set_enable(struct iio_dev *indio_dev, bool enable)
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
 
 	if (enable) {
-		tmp_value = sdata->sensor->pw.value_on;
-		if ((sdata->sensor->odr.addr == sdata->sensor->pw.addr) &&
-			(sdata->sensor->odr.mask == sdata->sensor->pw.mask)) {
-			err = st_sensors_match_odr(sdata->sensor,
+		tmp_value = sdata->sensor_settings->pw.value_on;
+		if ((sdata->sensor_settings->odr.addr ==
+					sdata->sensor_settings->pw.addr) &&
+				(sdata->sensor_settings->odr.mask ==
+					sdata->sensor_settings->pw.mask)) {
+			err = st_sensors_match_odr(sdata->sensor_settings,
 							sdata->odr, &odr_out);
 			if (err < 0)
 				goto set_enable_error;
@@ -164,8 +168,8 @@ int st_sensors_set_enable(struct iio_dev *indio_dev, bool enable)
 			found = true;
 		}
 		err = st_sensors_write_data_with_mask(indio_dev,
-				sdata->sensor->pw.addr,
-				sdata->sensor->pw.mask, tmp_value);
+				sdata->sensor_settings->pw.addr,
+				sdata->sensor_settings->pw.mask, tmp_value);
 		if (err < 0)
 			goto set_enable_error;
 
@@ -175,9 +179,9 @@ int st_sensors_set_enable(struct iio_dev *indio_dev, bool enable)
 			sdata->odr = odr_out.hz;
 	} else {
 		err = st_sensors_write_data_with_mask(indio_dev,
-				sdata->sensor->pw.addr,
-				sdata->sensor->pw.mask,
-				sdata->sensor->pw.value_off);
+				sdata->sensor_settings->pw.addr,
+				sdata->sensor_settings->pw.mask,
+				sdata->sensor_settings->pw.value_off);
 		if (err < 0)
 			goto set_enable_error;
 
@@ -194,8 +198,9 @@ int st_sensors_set_axis_enable(struct iio_dev *indio_dev, u8 axis_enable)
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
 
 	return st_sensors_write_data_with_mask(indio_dev,
-				sdata->sensor->enable_axis.addr,
-				sdata->sensor->enable_axis.mask, axis_enable);
+				sdata->sensor_settings->enable_axis.addr,
+				sdata->sensor_settings->enable_axis.mask,
+				axis_enable);
 }
 EXPORT_SYMBOL(st_sensors_set_axis_enable);
 
@@ -236,13 +241,13 @@ void st_sensors_power_disable(struct iio_dev *indio_dev)
 EXPORT_SYMBOL(st_sensors_power_disable);
 
 static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev,
-				       struct st_sensors_platform_data *pdata)
+					struct st_sensors_platform_data *pdata)
 {
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
 
 	switch (pdata->drdy_int_pin) {
 	case 1:
-		if (sdata->sensor->drdy_irq.mask_int1 == 0) {
+		if (sdata->sensor_settings->drdy_irq.mask_int1 == 0) {
 			dev_err(&indio_dev->dev,
 					"DRDY on INT1 not available.\n");
 			return -EINVAL;
@@ -250,7 +255,7 @@ static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev,
 		sdata->drdy_int_pin = 1;
 		break;
 	case 2:
-		if (sdata->sensor->drdy_irq.mask_int2 == 0) {
+		if (sdata->sensor_settings->drdy_irq.mask_int2 == 0) {
 			dev_err(&indio_dev->dev,
 					"DRDY on INT2 not available.\n");
 			return -EINVAL;
@@ -318,7 +323,7 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
 
 	if (sdata->current_fullscale) {
 		err = st_sensors_set_fullscale(indio_dev,
-					       sdata->current_fullscale->num);
+						sdata->current_fullscale->num);
 		if (err < 0)
 			return err;
 	} else
@@ -330,7 +335,8 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
 
 	/* set BDU */
 	err = st_sensors_write_data_with_mask(indio_dev,
-			sdata->sensor->bdu.addr, sdata->sensor->bdu.mask, true);
+					sdata->sensor_settings->bdu.addr,
+					sdata->sensor_settings->bdu.mask, true);
 	if (err < 0)
 		return err;
 
@@ -346,26 +352,28 @@ int st_sensors_set_dataready_irq(struct iio_dev *indio_dev, bool enable)
 	u8 drdy_mask;
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
 
-	if (!sdata->sensor->drdy_irq.addr)
+	if (!sdata->sensor_settings->drdy_irq.addr)
 		return 0;
 
 	/* Enable/Disable the interrupt generator 1. */
-	if (sdata->sensor->drdy_irq.ig1.en_addr > 0) {
+	if (sdata->sensor_settings->drdy_irq.ig1.en_addr > 0) {
 		err = st_sensors_write_data_with_mask(indio_dev,
-			sdata->sensor->drdy_irq.ig1.en_addr,
-			sdata->sensor->drdy_irq.ig1.en_mask, (int)enable);
+				sdata->sensor_settings->drdy_irq.ig1.en_addr,
+				sdata->sensor_settings->drdy_irq.ig1.en_mask,
+				(int)enable);
 		if (err < 0)
 			goto st_accel_set_dataready_irq_error;
 	}
 
 	if (sdata->drdy_int_pin == 1)
-		drdy_mask = sdata->sensor->drdy_irq.mask_int1;
+		drdy_mask = sdata->sensor_settings->drdy_irq.mask_int1;
 	else
-		drdy_mask = sdata->sensor->drdy_irq.mask_int2;
+		drdy_mask = sdata->sensor_settings->drdy_irq.mask_int2;
 
 	/* Enable/Disable the interrupt generator for data ready. */
 	err = st_sensors_write_data_with_mask(indio_dev,
-			sdata->sensor->drdy_irq.addr, drdy_mask, (int)enable);
+					sdata->sensor_settings->drdy_irq.addr,
+					drdy_mask, (int)enable);
 
 st_accel_set_dataready_irq_error:
 	return err;
@@ -378,8 +386,8 @@ int st_sensors_set_fullscale_by_gain(struct iio_dev *indio_dev, int scale)
 	struct st_sensor_data *sdata = iio_priv(indio_dev);
 
 	for (i = 0; i < ST_SENSORS_FULLSCALE_AVL_MAX; i++) {
-		if ((sdata->sensor->fs.fs_avl[i].gain == scale) &&
-				(sdata->sensor->fs.fs_avl[i].gain != 0)) {
+		if ((sdata->sensor_settings->fs.fs_avl[i].gain == scale) &&
+				(sdata->sensor_settings->fs.fs_avl[i].gain != 0)) {
 			err = 0;
 			break;
 		}
@@ -388,7 +396,7 @@ int st_sensors_set_fullscale_by_gain(struct iio_dev *indio_dev, int scale)
 		goto st_sensors_match_scale_error;
 
 	err = st_sensors_set_fullscale(indio_dev,
-					sdata->sensor->fs.fs_avl[i].num);
+				sdata->sensor_settings->fs.fs_avl[i].num);
 
 st_sensors_match_scale_error:
 	return err;
@@ -439,7 +447,7 @@ int st_sensors_read_info_raw(struct iio_dev *indio_dev,
 		if (err < 0)
 			goto out;
 
-		msleep((sdata->sensor->bootime * 1000) / sdata->odr);
+		msleep((sdata->sensor_settings->bootime * 1000) / sdata->odr);
 		err = st_sensors_read_axis_data(indio_dev, ch, val);
 		if (err < 0)
 			goto out;
@@ -456,7 +464,8 @@ out:
 EXPORT_SYMBOL(st_sensors_read_info_raw);
 
 int st_sensors_check_device_support(struct iio_dev *indio_dev,
-			int num_sensors_list, const struct st_sensors *sensors)
+			int num_sensors_list,
+			const struct st_sensor_settings *sensor_settings)
 {
 	u8 wai;
 	int i, n, err;
@@ -470,23 +479,24 @@ int st_sensors_check_device_support(struct iio_dev *indio_dev,
 	}
 
 	for (i = 0; i < num_sensors_list; i++) {
-		if (sensors[i].wai == wai)
+		if (sensor_settings[i].wai == wai)
 			break;
 	}
 	if (i == num_sensors_list)
 		goto device_not_supported;
 
-	for (n = 0; n < ARRAY_SIZE(sensors[i].sensors_supported); n++) {
+	for (n = 0; n < ARRAY_SIZE(sensor_settings[i].sensors_supported); n++) {
 		if (strcmp(indio_dev->name,
-				&sensors[i].sensors_supported[n][0]) == 0)
+				&sensor_settings[i].sensors_supported[n][0]) == 0)
 			break;
 	}
-	if (n == ARRAY_SIZE(sensors[i].sensors_supported)) {
+	if (n == ARRAY_SIZE(sensor_settings[i].sensors_supported)) {
 		dev_err(&indio_dev->dev, "device name and WhoAmI mismatch.\n");
 		goto sensor_name_mismatch;
 	}
 
-	sdata->sensor = (struct st_sensors *)&sensors[i];
+	sdata->sensor_settings =
+			(struct st_sensor_settings *)&sensor_settings[i];
 
 	return i;
 
@@ -508,11 +518,11 @@ ssize_t st_sensors_sysfs_sampling_frequency_avail(struct device *dev,
 
 	mutex_lock(&indio_dev->mlock);
 	for (i = 0; i < ST_SENSORS_ODR_LIST_MAX; i++) {
-		if (sdata->sensor->odr.odr_avl[i].hz == 0)
+		if (sdata->sensor_settings->odr.odr_avl[i].hz == 0)
 			break;
 
 		len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
-					sdata->sensor->odr.odr_avl[i].hz);
+				sdata->sensor_settings->odr.odr_avl[i].hz);
 	}
 	mutex_unlock(&indio_dev->mlock);
 	buf[len - 1] = '\n';
@@ -530,11 +540,11 @@ ssize_t st_sensors_sysfs_scale_avail(struct device *dev,
 
 	mutex_lock(&indio_dev->mlock);
 	for (i = 0; i < ST_SENSORS_FULLSCALE_AVL_MAX; i++) {
-		if (sdata->sensor->fs.fs_avl[i].num == 0)
+		if (sdata->sensor_settings->fs.fs_avl[i].num == 0)
 			break;
 
 		len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
-					sdata->sensor->fs.fs_avl[i].gain);
+				sdata->sensor_settings->fs.fs_avl[i].gain);
 	}
 	mutex_unlock(&indio_dev->mlock);
 	buf[len - 1] = '\n';
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index f156fc6..9d41b68 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -103,7 +103,7 @@ static const struct iio_chan_spec st_gyro_16bit_channels[] = {
 	IIO_CHAN_SOFT_TIMESTAMP(3)
 };
 
-static const struct st_sensors st_gyro_sensors[] = {
+static const struct st_sensor_settings st_gyro_sensors_settings[] = {
 	{
 		.wai = ST_GYRO_1_WAI_EXP,
 		.sensors_supported = {
@@ -322,18 +322,19 @@ int st_gyro_common_probe(struct iio_dev *indio_dev,
 	st_sensors_power_enable(indio_dev);
 
 	err = st_sensors_check_device_support(indio_dev,
-				ARRAY_SIZE(st_gyro_sensors), st_gyro_sensors);
+					ARRAY_SIZE(st_gyro_sensors_settings),
+					st_gyro_sensors_settings);
 	if (err < 0)
 		return err;
 
 	gdata->num_data_channels = ST_GYRO_NUMBER_DATA_CHANNELS;
-	gdata->multiread_bit = gdata->sensor->multi_read_bit;
-	indio_dev->channels = gdata->sensor->ch;
+	gdata->multiread_bit = gdata->sensor_settings->multi_read_bit;
+	indio_dev->channels = gdata->sensor_settings->ch;
 	indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
 
 	gdata->current_fullscale = (struct st_sensor_fullscale_avl *)
-						&gdata->sensor->fs.fs_avl[0];
-	gdata->odr = gdata->sensor->odr.odr_avl[0].hz;
+					&gdata->sensor_settings->fs.fs_avl[0];
+	gdata->odr = gdata->sensor_settings->odr.odr_avl[0].hz;
 
 	err = st_sensors_init_sensor(indio_dev, pdata);
 	if (err < 0)
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 68cae86..b422620 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -149,7 +149,7 @@ static const struct iio_chan_spec st_magn_2_16bit_channels[] = {
 	IIO_CHAN_SOFT_TIMESTAMP(3)
 };
 
-static const struct st_sensors st_magn_sensors[] = {
+static const struct st_sensor_settings st_magn_sensors_settings[] = {
 	{
 		.wai = ST_MAGN_1_WAI_EXP,
 		.sensors_supported = {
@@ -374,18 +374,19 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
 	st_sensors_power_enable(indio_dev);
 
 	err = st_sensors_check_device_support(indio_dev,
-				ARRAY_SIZE(st_magn_sensors), st_magn_sensors);
+					ARRAY_SIZE(st_magn_sensors_settings),
+					st_magn_sensors_settings);
 	if (err < 0)
 		return err;
 
 	mdata->num_data_channels = ST_MAGN_NUMBER_DATA_CHANNELS;
-	mdata->multiread_bit = mdata->sensor->multi_read_bit;
-	indio_dev->channels = mdata->sensor->ch;
+	mdata->multiread_bit = mdata->sensor_settings->multi_read_bit;
+	indio_dev->channels = mdata->sensor_settings->ch;
 	indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
 
 	mdata->current_fullscale = (struct st_sensor_fullscale_avl *)
-						&mdata->sensor->fs.fs_avl[0];
-	mdata->odr = mdata->sensor->odr.odr_avl[0].hz;
+					&mdata->sensor_settings->fs.fs_avl[0];
+	mdata->odr = mdata->sensor_settings->odr.odr_avl[0].hz;
 
 	err = st_sensors_init_sensor(indio_dev, pdata);
 	if (err < 0)
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 473d914..9563118 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -175,7 +175,7 @@ static const struct iio_chan_spec st_press_lps001wp_channels[] = {
 	IIO_CHAN_SOFT_TIMESTAMP(1)
 };
 
-static const struct st_sensors st_press_sensors[] = {
+static const struct st_sensor_settings st_press_sensors_settings[] = {
 	{
 		.wai = ST_PRESS_LPS331AP_WAI_EXP,
 		.sensors_supported = {
@@ -422,24 +422,24 @@ int st_press_common_probe(struct iio_dev *indio_dev,
 	st_sensors_power_enable(indio_dev);
 
 	err = st_sensors_check_device_support(indio_dev,
-					      ARRAY_SIZE(st_press_sensors),
-					      st_press_sensors);
+					ARRAY_SIZE(st_press_sensors_settings),
+					st_press_sensors_settings);
 	if (err < 0)
 		return err;
 
 	pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;
-	pdata->multiread_bit     = pdata->sensor->multi_read_bit;
-	indio_dev->channels      = pdata->sensor->ch;
-	indio_dev->num_channels  = pdata->sensor->num_ch;
+	pdata->multiread_bit = pdata->sensor_settings->multi_read_bit;
+	indio_dev->channels = pdata->sensor_settings->ch;
+	indio_dev->num_channels = pdata->sensor_settings->num_ch;
 
-	if (pdata->sensor->fs.addr != 0)
+	if (pdata->sensor_settings->fs.addr != 0)
 		pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
-			&pdata->sensor->fs.fs_avl[0];
+			&pdata->sensor_settings->fs.fs_avl[0];
 
-	pdata->odr = pdata->sensor->odr.odr_avl[0].hz;
+	pdata->odr = pdata->sensor_settings->odr.odr_avl[0].hz;
 
 	/* Some devices don't support a data ready pin. */
-	if (!plat_data && pdata->sensor->drdy_irq.addr)
+	if (!plat_data && pdata->sensor_settings->drdy_irq.addr)
 		plat_data =
 			(struct st_sensors_platform_data *)&default_press_pdata;
 
diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
index d8257ab..2c476ac 100644
--- a/include/linux/iio/common/st_sensors.h
+++ b/include/linux/iio/common/st_sensors.h
@@ -164,7 +164,7 @@ struct st_sensor_transfer_function {
 };
 
 /**
- * struct st_sensors - ST sensors list
+ * struct st_sensor_settings - ST specific sensor settings
  * @wai: Contents of WhoAmI register.
  * @sensors_supported: List of supported sensors by struct itself.
  * @ch: IIO channels for the sensor.
@@ -177,7 +177,7 @@ struct st_sensor_transfer_function {
  * @multi_read_bit: Use or not particular bit for [I2C/SPI] multi-read.
  * @bootime: samples to discard when sensor passing from power-down to power-up.
  */
-struct st_sensors {
+struct st_sensor_settings {
 	u8 wai;
 	char sensors_supported[ST_SENSORS_MAX_4WAI][ST_SENSORS_MAX_NAME];
 	struct iio_chan_spec *ch;
@@ -196,7 +196,7 @@ struct st_sensors {
  * struct st_sensor_data - ST sensor device status
  * @dev: Pointer to instance of struct device (I2C or SPI).
  * @trig: The trigger in use by the core driver.
- * @sensor: Pointer to the current sensor struct in use.
+ * @sensor_settings: Pointer to the specific sensor settings in use.
  * @current_fullscale: Maximum range of measure by the sensor.
  * @vdd: Pointer to sensor's Vdd power supply
  * @vdd_io: Pointer to sensor's Vdd-IO power supply
@@ -213,7 +213,7 @@ struct st_sensors {
 struct st_sensor_data {
 	struct device *dev;
 	struct iio_trigger *trig;
-	struct st_sensors *sensor;
+	struct st_sensor_settings *sensor_settings;
 	struct st_sensor_fullscale_avl *current_fullscale;
 	struct regulator *vdd;
 	struct regulator *vdd_io;
@@ -279,7 +279,7 @@ int st_sensors_read_info_raw(struct iio_dev *indio_dev,
 				struct iio_chan_spec const *ch, int *val);
 
 int st_sensors_check_device_support(struct iio_dev *indio_dev,
-			int num_sensors_list, const struct st_sensors *sensors);
+	int num_sensors_list, const struct st_sensor_settings *sensor_settings);
 
 ssize_t st_sensors_sysfs_sampling_frequency_avail(struct device *dev,
 				struct device_attribute *attr, char *buf);
-- 
1.9.1

[PATCH 2/7] iio:accel: Removed unnecessary parameter on common_probe function

[Denis CIOCCA]

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
---
 drivers/iio/accel/st_accel.h      | 3 +--
 drivers/iio/accel/st_accel_core.c | 9 ++++-----
 drivers/iio/accel/st_accel_i2c.c  | 2 +-
 drivers/iio/accel/st_accel_spi.c  | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
index c387763..fa96460 100644
--- a/drivers/iio/accel/st_accel.h
+++ b/drivers/iio/accel/st_accel.h
@@ -33,8 +33,7 @@ static const struct st_sensors_platform_data default_accel_pdata = {
 	.drdy_int_pin = 1,
 };
 
-int st_accel_common_probe(struct iio_dev *indio_dev,
-					struct st_sensors_platform_data *pdata);
+int st_accel_common_probe(struct iio_dev *indio_dev);
 void st_accel_common_remove(struct iio_dev *indio_dev);
 
 #ifdef CONFIG_IIO_BUFFER
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 7cbdfae..53f3262 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -457,8 +457,7 @@ static const struct iio_trigger_ops st_accel_trigger_ops = {
 #define ST_ACCEL_TRIGGER_OPS NULL
 #endif
 
-int st_accel_common_probe(struct iio_dev *indio_dev,
-				struct st_sensors_platform_data *plat_data)
+int st_accel_common_probe(struct iio_dev *indio_dev)
 {
 	struct st_sensor_data *adata = iio_priv(indio_dev);
 	int irq = adata->get_irq_data_ready(indio_dev);
@@ -484,11 +483,11 @@ int st_accel_common_probe(struct iio_dev *indio_dev,
 					&adata->sensor_settings->fs.fs_avl[0];
 	adata->odr = adata->sensor_settings->odr.odr_avl[0].hz;
 
-	if (!plat_data)
-		plat_data =
+	if (!adata->dev->platform_data)
+		adata->dev->platform_data =
 			(struct st_sensors_platform_data *)&default_accel_pdata;
 
-	err = st_sensors_init_sensor(indio_dev, plat_data);
+	err = st_sensors_init_sensor(indio_dev, adata->dev->platform_data);
 	if (err < 0)
 		return err;
 
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index 7164aef..40adc7e 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -84,7 +84,7 @@ static int st_accel_i2c_probe(struct i2c_client *client,
 
 	st_sensors_i2c_configure(indio_dev, client, adata);
 
-	err = st_accel_common_probe(indio_dev, client->dev.platform_data);
+	err = st_accel_common_probe(indio_dev);
 	if (err < 0)
 		return err;
 
diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
index 1956396..2090d80 100644
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -33,7 +33,7 @@ static int st_accel_spi_probe(struct spi_device *spi)
 
 	st_sensors_spi_configure(indio_dev, spi, adata);
 
-	err = st_accel_common_probe(indio_dev, spi->dev.platform_data);
+	err = st_accel_common_probe(indio_dev);
 	if (err < 0)
 		return err;
 
-- 
1.9.1

Re: [PATCH 2/7] iio:accel: Removed unnecessary parameter on common_probe function

[Jonathan Cameron]

On 03/10/14 16:35, Denis CIOCCA wrote:
> Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Applied
> ---
>  drivers/iio/accel/st_accel.h      | 3 +--
>  drivers/iio/accel/st_accel_core.c | 9 ++++-----
>  drivers/iio/accel/st_accel_i2c.c  | 2 +-
>  drivers/iio/accel/st_accel_spi.c  | 2 +-
>  4 files changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
> index c387763..fa96460 100644
> --- a/drivers/iio/accel/st_accel.h
> +++ b/drivers/iio/accel/st_accel.h
> @@ -33,8 +33,7 @@ static const struct st_sensors_platform_data default_accel_pdata = {
>  	.drdy_int_pin = 1,
>  };
>  
> -int st_accel_common_probe(struct iio_dev *indio_dev,
> -					struct st_sensors_platform_data *pdata);
> +int st_accel_common_probe(struct iio_dev *indio_dev);
>  void st_accel_common_remove(struct iio_dev *indio_dev);
>  
>  #ifdef CONFIG_IIO_BUFFER
> diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
> index 7cbdfae..53f3262 100644
> --- a/drivers/iio/accel/st_accel_core.c
> +++ b/drivers/iio/accel/st_accel_core.c
> @@ -457,8 +457,7 @@ static const struct iio_trigger_ops st_accel_trigger_ops = {
>  #define ST_ACCEL_TRIGGER_OPS NULL
>  #endif
>  
> -int st_accel_common_probe(struct iio_dev *indio_dev,
> -				struct st_sensors_platform_data *plat_data)
> +int st_accel_common_probe(struct iio_dev *indio_dev)
>  {
>  	struct st_sensor_data *adata = iio_priv(indio_dev);
>  	int irq = adata->get_irq_data_ready(indio_dev);
> @@ -484,11 +483,11 @@ int st_accel_common_probe(struct iio_dev *indio_dev,
>  					&adata->sensor_settings->fs.fs_avl[0];
>  	adata->odr = adata->sensor_settings->odr.odr_avl[0].hz;
>  
> -	if (!plat_data)
> -		plat_data =
> +	if (!adata->dev->platform_data)
> +		adata->dev->platform_data =
>  			(struct st_sensors_platform_data *)&default_accel_pdata;
>  
> -	err = st_sensors_init_sensor(indio_dev, plat_data);
> +	err = st_sensors_init_sensor(indio_dev, adata->dev->platform_data);
>  	if (err < 0)
>  		return err;
>  
> diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
> index 7164aef..40adc7e 100644
> --- a/drivers/iio/accel/st_accel_i2c.c
> +++ b/drivers/iio/accel/st_accel_i2c.c
> @@ -84,7 +84,7 @@ static int st_accel_i2c_probe(struct i2c_client *client,
>  
>  	st_sensors_i2c_configure(indio_dev, client, adata);
>  
> -	err = st_accel_common_probe(indio_dev, client->dev.platform_data);
> +	err = st_accel_common_probe(indio_dev);
>  	if (err < 0)
>  		return err;
>  
> diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
> index 1956396..2090d80 100644
> --- a/drivers/iio/accel/st_accel_spi.c
> +++ b/drivers/iio/accel/st_accel_spi.c
> @@ -33,7 +33,7 @@ static int st_accel_spi_probe(struct spi_device *spi)
>  
>  	st_sensors_spi_configure(indio_dev, spi, adata);
>  
> -	err = st_accel_common_probe(indio_dev, spi->dev.platform_data);
> +	err = st_accel_common_probe(indio_dev);
>  	if (err < 0)
>  		return err;
>  
> 

[PATCH 3/7] iio:gyro: Removed unnecessary parameter on common_probe function

[Denis CIOCCA]

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
---
 drivers/iio/gyro/st_gyro.h      | 3 +--
 drivers/iio/gyro/st_gyro_core.c | 6 +++---
 drivers/iio/gyro/st_gyro_i2c.c  | 3 +--
 drivers/iio/gyro/st_gyro_spi.c  | 3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/iio/gyro/st_gyro.h b/drivers/iio/gyro/st_gyro.h
index c197360..5353d63 100644
--- a/drivers/iio/gyro/st_gyro.h
+++ b/drivers/iio/gyro/st_gyro.h
@@ -30,8 +30,7 @@ static const struct st_sensors_platform_data gyro_pdata = {
 	.drdy_int_pin = 2,
 };
 
-int st_gyro_common_probe(struct iio_dev *indio_dev,
-					struct st_sensors_platform_data *pdata);
+int st_gyro_common_probe(struct iio_dev *indio_dev);
 void st_gyro_common_remove(struct iio_dev *indio_dev);
 
 #ifdef CONFIG_IIO_BUFFER
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index 9d41b68..f07a233 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -309,8 +309,7 @@ static const struct iio_trigger_ops st_gyro_trigger_ops = {
 #define ST_GYRO_TRIGGER_OPS NULL
 #endif
 
-int st_gyro_common_probe(struct iio_dev *indio_dev,
-					struct st_sensors_platform_data *pdata)
+int st_gyro_common_probe(struct iio_dev *indio_dev)
 {
 	struct st_sensor_data *gdata = iio_priv(indio_dev);
 	int irq = gdata->get_irq_data_ready(indio_dev);
@@ -336,7 +335,8 @@ int st_gyro_common_probe(struct iio_dev *indio_dev,
 					&gdata->sensor_settings->fs.fs_avl[0];
 	gdata->odr = gdata->sensor_settings->odr.odr_avl[0].hz;
 
-	err = st_sensors_init_sensor(indio_dev, pdata);
+	err = st_sensors_init_sensor(indio_dev,
+				(struct st_sensors_platform_data *)&gyro_pdata);
 	if (err < 0)
 		return err;
 
diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
index 8fa0ad2..94d01fb 100644
--- a/drivers/iio/gyro/st_gyro_i2c.c
+++ b/drivers/iio/gyro/st_gyro_i2c.c
@@ -72,8 +72,7 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
 
 	st_sensors_i2c_configure(indio_dev, client, gdata);
 
-	err = st_gyro_common_probe(indio_dev,
-				(struct st_sensors_platform_data *)&gyro_pdata);
+	err = st_gyro_common_probe(indio_dev);
 	if (err < 0)
 		return err;
 
diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c
index b4ad3be..3e7a01a 100644
--- a/drivers/iio/gyro/st_gyro_spi.c
+++ b/drivers/iio/gyro/st_gyro_spi.c
@@ -33,8 +33,7 @@ static int st_gyro_spi_probe(struct spi_device *spi)
 
 	st_sensors_spi_configure(indio_dev, spi, gdata);
 
-	err = st_gyro_common_probe(indio_dev,
-				(struct st_sensors_platform_data *)&gyro_pdata);
+	err = st_gyro_common_probe(indio_dev);
 	if (err < 0)
 		return err;
 
-- 
1.9.1

Re: [PATCH 3/7] iio:gyro: Removed unnecessary parameter on common_probe function

[Jonathan Cameron]

On 03/10/14 16:35, Denis CIOCCA wrote:
> Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Applied.
> ---
>  drivers/iio/gyro/st_gyro.h      | 3 +--
>  drivers/iio/gyro/st_gyro_core.c | 6 +++---
>  drivers/iio/gyro/st_gyro_i2c.c  | 3 +--
>  drivers/iio/gyro/st_gyro_spi.c  | 3 +--
>  4 files changed, 6 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/iio/gyro/st_gyro.h b/drivers/iio/gyro/st_gyro.h
> index c197360..5353d63 100644
> --- a/drivers/iio/gyro/st_gyro.h
> +++ b/drivers/iio/gyro/st_gyro.h
> @@ -30,8 +30,7 @@ static const struct st_sensors_platform_data gyro_pdata = {
>  	.drdy_int_pin = 2,
>  };
>  
> -int st_gyro_common_probe(struct iio_dev *indio_dev,
> -					struct st_sensors_platform_data *pdata);
> +int st_gyro_common_probe(struct iio_dev *indio_dev);
>  void st_gyro_common_remove(struct iio_dev *indio_dev);
>  
>  #ifdef CONFIG_IIO_BUFFER
> diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
> index 9d41b68..f07a233 100644
> --- a/drivers/iio/gyro/st_gyro_core.c
> +++ b/drivers/iio/gyro/st_gyro_core.c
> @@ -309,8 +309,7 @@ static const struct iio_trigger_ops st_gyro_trigger_ops = {
>  #define ST_GYRO_TRIGGER_OPS NULL
>  #endif
>  
> -int st_gyro_common_probe(struct iio_dev *indio_dev,
> -					struct st_sensors_platform_data *pdata)
> +int st_gyro_common_probe(struct iio_dev *indio_dev)
>  {
>  	struct st_sensor_data *gdata = iio_priv(indio_dev);
>  	int irq = gdata->get_irq_data_ready(indio_dev);
> @@ -336,7 +335,8 @@ int st_gyro_common_probe(struct iio_dev *indio_dev,
>  					&gdata->sensor_settings->fs.fs_avl[0];
>  	gdata->odr = gdata->sensor_settings->odr.odr_avl[0].hz;
>  
> -	err = st_sensors_init_sensor(indio_dev, pdata);
> +	err = st_sensors_init_sensor(indio_dev,
> +				(struct st_sensors_platform_data *)&gyro_pdata);
>  	if (err < 0)
>  		return err;
>  
> diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
> index 8fa0ad2..94d01fb 100644
> --- a/drivers/iio/gyro/st_gyro_i2c.c
> +++ b/drivers/iio/gyro/st_gyro_i2c.c
> @@ -72,8 +72,7 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
>  
>  	st_sensors_i2c_configure(indio_dev, client, gdata);
>  
> -	err = st_gyro_common_probe(indio_dev,
> -				(struct st_sensors_platform_data *)&gyro_pdata);
> +	err = st_gyro_common_probe(indio_dev);
>  	if (err < 0)
>  		return err;
>  
> diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c
> index b4ad3be..3e7a01a 100644
> --- a/drivers/iio/gyro/st_gyro_spi.c
> +++ b/drivers/iio/gyro/st_gyro_spi.c
> @@ -33,8 +33,7 @@ static int st_gyro_spi_probe(struct spi_device *spi)
>  
>  	st_sensors_spi_configure(indio_dev, spi, gdata);
>  
> -	err = st_gyro_common_probe(indio_dev,
> -				(struct st_sensors_platform_data *)&gyro_pdata);
> +	err = st_gyro_common_probe(indio_dev);
>  	if (err < 0)
>  		return err;
>  
> 

[PATCH 4/7] iio:magnetometer: Removed unnecessary parameter on common_probe function

[Denis CIOCCA]

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
---
 drivers/iio/magnetometer/st_magn.h      | 3 +--
 drivers/iio/magnetometer/st_magn_core.c | 5 ++---
 drivers/iio/magnetometer/st_magn_i2c.c  | 2 +-
 drivers/iio/magnetometer/st_magn_spi.c  | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/iio/magnetometer/st_magn.h b/drivers/iio/magnetometer/st_magn.h
index 694e33e..7e81d00 100644
--- a/drivers/iio/magnetometer/st_magn.h
+++ b/drivers/iio/magnetometer/st_magn.h
@@ -18,8 +18,7 @@
 #define LSM303DLM_MAGN_DEV_NAME		"lsm303dlm_magn"
 #define LIS3MDL_MAGN_DEV_NAME		"lis3mdl"
 
-int st_magn_common_probe(struct iio_dev *indio_dev,
-					struct st_sensors_platform_data *pdata);
+int st_magn_common_probe(struct iio_dev *indio_dev);
 void st_magn_common_remove(struct iio_dev *indio_dev);
 
 #ifdef CONFIG_IIO_BUFFER
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index b422620..8ade473 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -361,8 +361,7 @@ static const struct iio_info magn_info = {
 	.write_raw = &st_magn_write_raw,
 };
 
-int st_magn_common_probe(struct iio_dev *indio_dev,
-					struct st_sensors_platform_data *pdata)
+int st_magn_common_probe(struct iio_dev *indio_dev)
 {
 	struct st_sensor_data *mdata = iio_priv(indio_dev);
 	int irq = mdata->get_irq_data_ready(indio_dev);
@@ -388,7 +387,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
 					&mdata->sensor_settings->fs.fs_avl[0];
 	mdata->odr = mdata->sensor_settings->odr.odr_avl[0].hz;
 
-	err = st_sensors_init_sensor(indio_dev, pdata);
+	err = st_sensors_init_sensor(indio_dev, NULL);
 	if (err < 0)
 		return err;
 
diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
index 6892500..f8a6823 100644
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -56,7 +56,7 @@ static int st_magn_i2c_probe(struct i2c_client *client,
 
 	st_sensors_i2c_configure(indio_dev, client, mdata);
 
-	err = st_magn_common_probe(indio_dev, NULL);
+	err = st_magn_common_probe(indio_dev);
 	if (err < 0)
 		return err;
 
diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
index a6143ea..f642142 100644
--- a/drivers/iio/magnetometer/st_magn_spi.c
+++ b/drivers/iio/magnetometer/st_magn_spi.c
@@ -33,7 +33,7 @@ static int st_magn_spi_probe(struct spi_device *spi)
 
 	st_sensors_spi_configure(indio_dev, spi, mdata);
 
-	err = st_magn_common_probe(indio_dev, NULL);
+	err = st_magn_common_probe(indio_dev);
 	if (err < 0)
 		return err;
 
-- 
1.9.1

Re: [PATCH 4/7] iio:magnetometer: Removed unnecessary parameter on common_probe function

[Jonathan Cameron]

On 03/10/14 16:35, Denis CIOCCA wrote:
> Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Applied
> ---
>  drivers/iio/magnetometer/st_magn.h      | 3 +--
>  drivers/iio/magnetometer/st_magn_core.c | 5 ++---
>  drivers/iio/magnetometer/st_magn_i2c.c  | 2 +-
>  drivers/iio/magnetometer/st_magn_spi.c  | 2 +-
>  4 files changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/iio/magnetometer/st_magn.h b/drivers/iio/magnetometer/st_magn.h
> index 694e33e..7e81d00 100644
> --- a/drivers/iio/magnetometer/st_magn.h
> +++ b/drivers/iio/magnetometer/st_magn.h
> @@ -18,8 +18,7 @@
>  #define LSM303DLM_MAGN_DEV_NAME		"lsm303dlm_magn"
>  #define LIS3MDL_MAGN_DEV_NAME		"lis3mdl"
>  
> -int st_magn_common_probe(struct iio_dev *indio_dev,
> -					struct st_sensors_platform_data *pdata);
> +int st_magn_common_probe(struct iio_dev *indio_dev);
>  void st_magn_common_remove(struct iio_dev *indio_dev);
>  
>  #ifdef CONFIG_IIO_BUFFER
> diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
> index b422620..8ade473 100644
> --- a/drivers/iio/magnetometer/st_magn_core.c
> +++ b/drivers/iio/magnetometer/st_magn_core.c
> @@ -361,8 +361,7 @@ static const struct iio_info magn_info = {
>  	.write_raw = &st_magn_write_raw,
>  };
>  
> -int st_magn_common_probe(struct iio_dev *indio_dev,
> -					struct st_sensors_platform_data *pdata)
> +int st_magn_common_probe(struct iio_dev *indio_dev)
>  {
>  	struct st_sensor_data *mdata = iio_priv(indio_dev);
>  	int irq = mdata->get_irq_data_ready(indio_dev);
> @@ -388,7 +387,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
>  					&mdata->sensor_settings->fs.fs_avl[0];
>  	mdata->odr = mdata->sensor_settings->odr.odr_avl[0].hz;
>  
> -	err = st_sensors_init_sensor(indio_dev, pdata);
> +	err = st_sensors_init_sensor(indio_dev, NULL);
>  	if (err < 0)
>  		return err;
>  
> diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
> index 6892500..f8a6823 100644
> --- a/drivers/iio/magnetometer/st_magn_i2c.c
> +++ b/drivers/iio/magnetometer/st_magn_i2c.c
> @@ -56,7 +56,7 @@ static int st_magn_i2c_probe(struct i2c_client *client,
>  
>  	st_sensors_i2c_configure(indio_dev, client, mdata);
>  
> -	err = st_magn_common_probe(indio_dev, NULL);
> +	err = st_magn_common_probe(indio_dev);
>  	if (err < 0)
>  		return err;
>  
> diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
> index a6143ea..f642142 100644
> --- a/drivers/iio/magnetometer/st_magn_spi.c
> +++ b/drivers/iio/magnetometer/st_magn_spi.c
> @@ -33,7 +33,7 @@ static int st_magn_spi_probe(struct spi_device *spi)
>  
>  	st_sensors_spi_configure(indio_dev, spi, mdata);
>  
> -	err = st_magn_common_probe(indio_dev, NULL);
> +	err = st_magn_common_probe(indio_dev);
>  	if (err < 0)
>  		return err;
>  
> 

[PATCH 5/7] iio:pressure: Removed unnecessary parameter on common_probe function

[Denis CIOCCA]

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
---
 drivers/iio/pressure/st_pressure.h      | 3 +--
 drivers/iio/pressure/st_pressure_core.c | 9 ++++-----
 drivers/iio/pressure/st_pressure_i2c.c  | 2 +-
 drivers/iio/pressure/st_pressure_spi.c  | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/drivers/iio/pressure/st_pressure.h b/drivers/iio/pressure/st_pressure.h
index 242943c..f5f4149 100644
--- a/drivers/iio/pressure/st_pressure.h
+++ b/drivers/iio/pressure/st_pressure.h
@@ -26,8 +26,7 @@ static const struct st_sensors_platform_data default_press_pdata = {
 	.drdy_int_pin = 1,
 };
 
-int st_press_common_probe(struct iio_dev *indio_dev,
-					struct st_sensors_platform_data *pdata);
+int st_press_common_probe(struct iio_dev *indio_dev);
 void st_press_common_remove(struct iio_dev *indio_dev);
 
 #ifdef CONFIG_IIO_BUFFER
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 9563118..ee2ef7d 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -409,8 +409,7 @@ static const struct iio_trigger_ops st_press_trigger_ops = {
 #define ST_PRESS_TRIGGER_OPS NULL
 #endif
 
-int st_press_common_probe(struct iio_dev *indio_dev,
-				struct st_sensors_platform_data *plat_data)
+int st_press_common_probe(struct iio_dev *indio_dev)
 {
 	struct st_sensor_data *pdata = iio_priv(indio_dev);
 	int irq = pdata->get_irq_data_ready(indio_dev);
@@ -439,11 +438,11 @@ int st_press_common_probe(struct iio_dev *indio_dev,
 	pdata->odr = pdata->sensor_settings->odr.odr_avl[0].hz;
 
 	/* Some devices don't support a data ready pin. */
-	if (!plat_data && pdata->sensor_settings->drdy_irq.addr)
-		plat_data =
+	if (!pdata->dev->platform_data && pdata->sensor_settings->drdy_irq.addr)
+		pdata->dev->platform_data =
 			(struct st_sensors_platform_data *)&default_press_pdata;
 
-	err = st_sensors_init_sensor(indio_dev, plat_data);
+	err = st_sensors_init_sensor(indio_dev, pdata->dev->platform_data);
 	if (err < 0)
 		return err;
 
diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
index acaf165..dd73351 100644
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -56,7 +56,7 @@ static int st_press_i2c_probe(struct i2c_client *client,
 
 	st_sensors_i2c_configure(indio_dev, client, pdata);
 
-	err = st_press_common_probe(indio_dev, client->dev.platform_data);
+	err = st_press_common_probe(indio_dev);
 	if (err < 0)
 		return err;
 
diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c
index f45d430..98c3e8e 100644
--- a/drivers/iio/pressure/st_pressure_spi.c
+++ b/drivers/iio/pressure/st_pressure_spi.c
@@ -33,7 +33,7 @@ static int st_press_spi_probe(struct spi_device *spi)
 
 	st_sensors_spi_configure(indio_dev, spi, pdata);
 
-	err = st_press_common_probe(indio_dev, spi->dev.platform_data);
+	err = st_press_common_probe(indio_dev);
 	if (err < 0)
 		return err;
 
-- 
1.9.1

Re: [PATCH 5/7] iio:pressure: Removed unnecessary parameter on common_probe function

[Jonathan Cameron]

On 03/10/14 16:35, Denis CIOCCA wrote:
> Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Applied
> ---
>  drivers/iio/pressure/st_pressure.h      | 3 +--
>  drivers/iio/pressure/st_pressure_core.c | 9 ++++-----
>  drivers/iio/pressure/st_pressure_i2c.c  | 2 +-
>  drivers/iio/pressure/st_pressure_spi.c  | 2 +-
>  4 files changed, 7 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/iio/pressure/st_pressure.h b/drivers/iio/pressure/st_pressure.h
> index 242943c..f5f4149 100644
> --- a/drivers/iio/pressure/st_pressure.h
> +++ b/drivers/iio/pressure/st_pressure.h
> @@ -26,8 +26,7 @@ static const struct st_sensors_platform_data default_press_pdata = {
>  	.drdy_int_pin = 1,
>  };
>  
> -int st_press_common_probe(struct iio_dev *indio_dev,
> -					struct st_sensors_platform_data *pdata);
> +int st_press_common_probe(struct iio_dev *indio_dev);
>  void st_press_common_remove(struct iio_dev *indio_dev);
>  
>  #ifdef CONFIG_IIO_BUFFER
> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
> index 9563118..ee2ef7d 100644
> --- a/drivers/iio/pressure/st_pressure_core.c
> +++ b/drivers/iio/pressure/st_pressure_core.c
> @@ -409,8 +409,7 @@ static const struct iio_trigger_ops st_press_trigger_ops = {
>  #define ST_PRESS_TRIGGER_OPS NULL
>  #endif
>  
> -int st_press_common_probe(struct iio_dev *indio_dev,
> -				struct st_sensors_platform_data *plat_data)
> +int st_press_common_probe(struct iio_dev *indio_dev)
>  {
>  	struct st_sensor_data *pdata = iio_priv(indio_dev);
>  	int irq = pdata->get_irq_data_ready(indio_dev);
> @@ -439,11 +438,11 @@ int st_press_common_probe(struct iio_dev *indio_dev,
>  	pdata->odr = pdata->sensor_settings->odr.odr_avl[0].hz;
>  
>  	/* Some devices don't support a data ready pin. */
> -	if (!plat_data && pdata->sensor_settings->drdy_irq.addr)
> -		plat_data =
> +	if (!pdata->dev->platform_data && pdata->sensor_settings->drdy_irq.addr)
> +		pdata->dev->platform_data =
>  			(struct st_sensors_platform_data *)&default_press_pdata;
>  
> -	err = st_sensors_init_sensor(indio_dev, plat_data);
> +	err = st_sensors_init_sensor(indio_dev, pdata->dev->platform_data);
>  	if (err < 0)
>  		return err;
>  
> diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
> index acaf165..dd73351 100644
> --- a/drivers/iio/pressure/st_pressure_i2c.c
> +++ b/drivers/iio/pressure/st_pressure_i2c.c
> @@ -56,7 +56,7 @@ static int st_press_i2c_probe(struct i2c_client *client,
>  
>  	st_sensors_i2c_configure(indio_dev, client, pdata);
>  
> -	err = st_press_common_probe(indio_dev, client->dev.platform_data);
> +	err = st_press_common_probe(indio_dev);
>  	if (err < 0)
>  		return err;
>  
> diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c
> index f45d430..98c3e8e 100644
> --- a/drivers/iio/pressure/st_pressure_spi.c
> +++ b/drivers/iio/pressure/st_pressure_spi.c
> @@ -33,7 +33,7 @@ static int st_press_spi_probe(struct spi_device *spi)
>  
>  	st_sensors_spi_configure(indio_dev, spi, pdata);
>  
> -	err = st_press_common_probe(indio_dev, spi->dev.platform_data);
> +	err = st_press_common_probe(indio_dev);
>  	if (err < 0)
>  		return err;
>  
> 

[PATCH 6/7] iio:pressure: Changed pressure data variable name to press_data

[Denis CIOCCA]

This patch fix pressure data variable name. Usually pdata name
it is used for platform data.

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
---
 drivers/iio/pressure/st_pressure_buffer.c | 12 +++++-----
 drivers/iio/pressure/st_pressure_core.c   | 40 ++++++++++++++++---------------
 drivers/iio/pressure/st_pressure_i2c.c    | 10 ++++----
 drivers/iio/pressure/st_pressure_spi.c    | 10 ++++----
 4 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/drivers/iio/pressure/st_pressure_buffer.c b/drivers/iio/pressure/st_pressure_buffer.c
index b37b1c9..2ff53f2 100644
--- a/drivers/iio/pressure/st_pressure_buffer.c
+++ b/drivers/iio/pressure/st_pressure_buffer.c
@@ -38,10 +38,10 @@ static int st_press_buffer_preenable(struct iio_dev *indio_dev)
 static int st_press_buffer_postenable(struct iio_dev *indio_dev)
 {
 	int err;
-	struct st_sensor_data *pdata = iio_priv(indio_dev);
+	struct st_sensor_data *press_data = iio_priv(indio_dev);
 
-	pdata->buffer_data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
-	if (pdata->buffer_data == NULL) {
+	press_data->buffer_data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
+	if (press_data->buffer_data == NULL) {
 		err = -ENOMEM;
 		goto allocate_memory_error;
 	}
@@ -53,7 +53,7 @@ static int st_press_buffer_postenable(struct iio_dev *indio_dev)
 	return err;
 
 st_press_buffer_postenable_error:
-	kfree(pdata->buffer_data);
+	kfree(press_data->buffer_data);
 allocate_memory_error:
 	return err;
 }
@@ -61,7 +61,7 @@ allocate_memory_error:
 static int st_press_buffer_predisable(struct iio_dev *indio_dev)
 {
 	int err;
-	struct st_sensor_data *pdata = iio_priv(indio_dev);
+	struct st_sensor_data *press_data = iio_priv(indio_dev);
 
 	err = iio_triggered_buffer_predisable(indio_dev);
 	if (err < 0)
@@ -70,7 +70,7 @@ static int st_press_buffer_predisable(struct iio_dev *indio_dev)
 	err = st_sensors_set_enable(indio_dev, false);
 
 st_press_buffer_predisable_error:
-	kfree(pdata->buffer_data);
+	kfree(press_data->buffer_data);
 	return err;
 }
 
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index ee2ef7d..97baf40d 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -333,7 +333,7 @@ static int st_press_read_raw(struct iio_dev *indio_dev,
 							int *val2, long mask)
 {
 	int err;
-	struct st_sensor_data *pdata = iio_priv(indio_dev);
+	struct st_sensor_data *press_data = iio_priv(indio_dev);
 
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
@@ -347,10 +347,10 @@ static int st_press_read_raw(struct iio_dev *indio_dev,
 
 		switch (ch->type) {
 		case IIO_PRESSURE:
-			*val2 = pdata->current_fullscale->gain;
+			*val2 = press_data->current_fullscale->gain;
 			break;
 		case IIO_TEMP:
-			*val2 = pdata->current_fullscale->gain2;
+			*val2 = press_data->current_fullscale->gain2;
 			break;
 		default:
 			err = -EINVAL;
@@ -371,7 +371,7 @@ static int st_press_read_raw(struct iio_dev *indio_dev,
 
 		return IIO_VAL_FRACTIONAL;
 	case IIO_CHAN_INFO_SAMP_FREQ:
-		*val = pdata->odr;
+		*val = press_data->odr;
 		return IIO_VAL_INT;
 	default:
 		return -EINVAL;
@@ -411,8 +411,8 @@ static const struct iio_trigger_ops st_press_trigger_ops = {
 
 int st_press_common_probe(struct iio_dev *indio_dev)
 {
-	struct st_sensor_data *pdata = iio_priv(indio_dev);
-	int irq = pdata->get_irq_data_ready(indio_dev);
+	struct st_sensor_data *press_data = iio_priv(indio_dev);
+	int irq = press_data->get_irq_data_ready(indio_dev);
 	int err;
 
 	indio_dev->modes = INDIO_DIRECT_MODE;
@@ -426,23 +426,25 @@ int st_press_common_probe(struct iio_dev *indio_dev)
 	if (err < 0)
 		return err;
 
-	pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;
-	pdata->multiread_bit = pdata->sensor_settings->multi_read_bit;
-	indio_dev->channels = pdata->sensor_settings->ch;
-	indio_dev->num_channels = pdata->sensor_settings->num_ch;
+	press_data->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;
+	press_data->multiread_bit = press_data->sensor_settings->multi_read_bit;
+	indio_dev->channels = press_data->sensor_settings->ch;
+	indio_dev->num_channels = press_data->sensor_settings->num_ch;
 
-	if (pdata->sensor_settings->fs.addr != 0)
-		pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
-			&pdata->sensor_settings->fs.fs_avl[0];
+	if (press_data->sensor_settings->fs.addr != 0)
+		press_data->current_fullscale =
+			(struct st_sensor_fullscale_avl *)
+				&press_data->sensor_settings->fs.fs_avl[0];
 
-	pdata->odr = pdata->sensor_settings->odr.odr_avl[0].hz;
+	press_data->odr = press_data->sensor_settings->odr.odr_avl[0].hz;
 
 	/* Some devices don't support a data ready pin. */
-	if (!pdata->dev->platform_data && pdata->sensor_settings->drdy_irq.addr)
-		pdata->dev->platform_data =
+	if (!press_data->dev->platform_data &&
+				press_data->sensor_settings->drdy_irq.addr)
+		press_data->dev->platform_data =
 			(struct st_sensors_platform_data *)&default_press_pdata;
 
-	err = st_sensors_init_sensor(indio_dev, pdata->dev->platform_data);
+	err = st_sensors_init_sensor(indio_dev, press_data->dev->platform_data);
 	if (err < 0)
 		return err;
 
@@ -478,12 +480,12 @@ EXPORT_SYMBOL(st_press_common_probe);
 
 void st_press_common_remove(struct iio_dev *indio_dev)
 {
-	struct st_sensor_data *pdata = iio_priv(indio_dev);
+	struct st_sensor_data *press_data = iio_priv(indio_dev);
 
 	st_sensors_power_disable(indio_dev);
 
 	iio_device_unregister(indio_dev);
-	if (pdata->get_irq_data_ready(indio_dev) > 0)
+	if (press_data->get_irq_data_ready(indio_dev) > 0)
 		st_sensors_deallocate_trigger(indio_dev);
 
 	st_press_deallocate_ring(indio_dev);
diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
index dd73351..8859e93 100644
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -43,18 +43,18 @@ static int st_press_i2c_probe(struct i2c_client *client,
 						const struct i2c_device_id *id)
 {
 	struct iio_dev *indio_dev;
-	struct st_sensor_data *pdata;
+	struct st_sensor_data *press_data;
 	int err;
 
-	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*pdata));
+	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*press_data));
 	if (!indio_dev)
 		return -ENOMEM;
 
-	pdata = iio_priv(indio_dev);
-	pdata->dev = &client->dev;
+	press_data = iio_priv(indio_dev);
+	press_data->dev = &client->dev;
 	st_sensors_of_i2c_probe(client, st_press_of_match);
 
-	st_sensors_i2c_configure(indio_dev, client, pdata);
+	st_sensors_i2c_configure(indio_dev, client, press_data);
 
 	err = st_press_common_probe(indio_dev);
 	if (err < 0)
diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c
index 98c3e8e..10c9624 100644
--- a/drivers/iio/pressure/st_pressure_spi.c
+++ b/drivers/iio/pressure/st_pressure_spi.c
@@ -21,17 +21,17 @@
 static int st_press_spi_probe(struct spi_device *spi)
 {
 	struct iio_dev *indio_dev;
-	struct st_sensor_data *pdata;
+	struct st_sensor_data *press_data;
 	int err;
 
-	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*pdata));
+	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*press_data));
 	if (indio_dev == NULL)
 		return -ENOMEM;
 
-	pdata = iio_priv(indio_dev);
-	pdata->dev = &spi->dev;
+	press_data = iio_priv(indio_dev);
+	press_data->dev = &spi->dev;
 
-	st_sensors_spi_configure(indio_dev, spi, pdata);
+	st_sensors_spi_configure(indio_dev, spi, press_data);
 
 	err = st_press_common_probe(indio_dev);
 	if (err < 0)
-- 
1.9.1

Re: [PATCH 6/7] iio:pressure: Changed pressure data variable name to press_data

[Jonathan Cameron]

On 03/10/14 16:35, Denis CIOCCA wrote:
> This patch fix pressure data variable name. Usually pdata name
> it is used for platform data.
> 
> Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Applied
> ---
>  drivers/iio/pressure/st_pressure_buffer.c | 12 +++++-----
>  drivers/iio/pressure/st_pressure_core.c   | 40 ++++++++++++++++---------------
>  drivers/iio/pressure/st_pressure_i2c.c    | 10 ++++----
>  drivers/iio/pressure/st_pressure_spi.c    | 10 ++++----
>  4 files changed, 37 insertions(+), 35 deletions(-)
> 
> diff --git a/drivers/iio/pressure/st_pressure_buffer.c b/drivers/iio/pressure/st_pressure_buffer.c
> index b37b1c9..2ff53f2 100644
> --- a/drivers/iio/pressure/st_pressure_buffer.c
> +++ b/drivers/iio/pressure/st_pressure_buffer.c
> @@ -38,10 +38,10 @@ static int st_press_buffer_preenable(struct iio_dev *indio_dev)
>  static int st_press_buffer_postenable(struct iio_dev *indio_dev)
>  {
>  	int err;
> -	struct st_sensor_data *pdata = iio_priv(indio_dev);
> +	struct st_sensor_data *press_data = iio_priv(indio_dev);
>  
> -	pdata->buffer_data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
> -	if (pdata->buffer_data == NULL) {
> +	press_data->buffer_data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
> +	if (press_data->buffer_data == NULL) {
>  		err = -ENOMEM;
>  		goto allocate_memory_error;
>  	}
> @@ -53,7 +53,7 @@ static int st_press_buffer_postenable(struct iio_dev *indio_dev)
>  	return err;
>  
>  st_press_buffer_postenable_error:
> -	kfree(pdata->buffer_data);
> +	kfree(press_data->buffer_data);
>  allocate_memory_error:
>  	return err;
>  }
> @@ -61,7 +61,7 @@ allocate_memory_error:
>  static int st_press_buffer_predisable(struct iio_dev *indio_dev)
>  {
>  	int err;
> -	struct st_sensor_data *pdata = iio_priv(indio_dev);
> +	struct st_sensor_data *press_data = iio_priv(indio_dev);
>  
>  	err = iio_triggered_buffer_predisable(indio_dev);
>  	if (err < 0)
> @@ -70,7 +70,7 @@ static int st_press_buffer_predisable(struct iio_dev *indio_dev)
>  	err = st_sensors_set_enable(indio_dev, false);
>  
>  st_press_buffer_predisable_error:
> -	kfree(pdata->buffer_data);
> +	kfree(press_data->buffer_data);
>  	return err;
>  }
>  
> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
> index ee2ef7d..97baf40d 100644
> --- a/drivers/iio/pressure/st_pressure_core.c
> +++ b/drivers/iio/pressure/st_pressure_core.c
> @@ -333,7 +333,7 @@ static int st_press_read_raw(struct iio_dev *indio_dev,
>  							int *val2, long mask)
>  {
>  	int err;
> -	struct st_sensor_data *pdata = iio_priv(indio_dev);
> +	struct st_sensor_data *press_data = iio_priv(indio_dev);
>  
>  	switch (mask) {
>  	case IIO_CHAN_INFO_RAW:
> @@ -347,10 +347,10 @@ static int st_press_read_raw(struct iio_dev *indio_dev,
>  
>  		switch (ch->type) {
>  		case IIO_PRESSURE:
> -			*val2 = pdata->current_fullscale->gain;
> +			*val2 = press_data->current_fullscale->gain;
>  			break;
>  		case IIO_TEMP:
> -			*val2 = pdata->current_fullscale->gain2;
> +			*val2 = press_data->current_fullscale->gain2;
>  			break;
>  		default:
>  			err = -EINVAL;
> @@ -371,7 +371,7 @@ static int st_press_read_raw(struct iio_dev *indio_dev,
>  
>  		return IIO_VAL_FRACTIONAL;
>  	case IIO_CHAN_INFO_SAMP_FREQ:
> -		*val = pdata->odr;
> +		*val = press_data->odr;
>  		return IIO_VAL_INT;
>  	default:
>  		return -EINVAL;
> @@ -411,8 +411,8 @@ static const struct iio_trigger_ops st_press_trigger_ops = {
>  
>  int st_press_common_probe(struct iio_dev *indio_dev)
>  {
> -	struct st_sensor_data *pdata = iio_priv(indio_dev);
> -	int irq = pdata->get_irq_data_ready(indio_dev);
> +	struct st_sensor_data *press_data = iio_priv(indio_dev);
> +	int irq = press_data->get_irq_data_ready(indio_dev);
>  	int err;
>  
>  	indio_dev->modes = INDIO_DIRECT_MODE;
> @@ -426,23 +426,25 @@ int st_press_common_probe(struct iio_dev *indio_dev)
>  	if (err < 0)
>  		return err;
>  
> -	pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;
> -	pdata->multiread_bit = pdata->sensor_settings->multi_read_bit;
> -	indio_dev->channels = pdata->sensor_settings->ch;
> -	indio_dev->num_channels = pdata->sensor_settings->num_ch;
> +	press_data->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;
> +	press_data->multiread_bit = press_data->sensor_settings->multi_read_bit;
> +	indio_dev->channels = press_data->sensor_settings->ch;
> +	indio_dev->num_channels = press_data->sensor_settings->num_ch;
>  
> -	if (pdata->sensor_settings->fs.addr != 0)
> -		pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
> -			&pdata->sensor_settings->fs.fs_avl[0];
> +	if (press_data->sensor_settings->fs.addr != 0)
> +		press_data->current_fullscale =
> +			(struct st_sensor_fullscale_avl *)
> +				&press_data->sensor_settings->fs.fs_avl[0];
>  
> -	pdata->odr = pdata->sensor_settings->odr.odr_avl[0].hz;
> +	press_data->odr = press_data->sensor_settings->odr.odr_avl[0].hz;
>  
>  	/* Some devices don't support a data ready pin. */
> -	if (!pdata->dev->platform_data && pdata->sensor_settings->drdy_irq.addr)
> -		pdata->dev->platform_data =
> +	if (!press_data->dev->platform_data &&
> +				press_data->sensor_settings->drdy_irq.addr)
> +		press_data->dev->platform_data =
>  			(struct st_sensors_platform_data *)&default_press_pdata;
>  
> -	err = st_sensors_init_sensor(indio_dev, pdata->dev->platform_data);
> +	err = st_sensors_init_sensor(indio_dev, press_data->dev->platform_data);
>  	if (err < 0)
>  		return err;
>  
> @@ -478,12 +480,12 @@ EXPORT_SYMBOL(st_press_common_probe);
>  
>  void st_press_common_remove(struct iio_dev *indio_dev)
>  {
> -	struct st_sensor_data *pdata = iio_priv(indio_dev);
> +	struct st_sensor_data *press_data = iio_priv(indio_dev);
>  
>  	st_sensors_power_disable(indio_dev);
>  
>  	iio_device_unregister(indio_dev);
> -	if (pdata->get_irq_data_ready(indio_dev) > 0)
> +	if (press_data->get_irq_data_ready(indio_dev) > 0)
>  		st_sensors_deallocate_trigger(indio_dev);
>  
>  	st_press_deallocate_ring(indio_dev);
> diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
> index dd73351..8859e93 100644
> --- a/drivers/iio/pressure/st_pressure_i2c.c
> +++ b/drivers/iio/pressure/st_pressure_i2c.c
> @@ -43,18 +43,18 @@ static int st_press_i2c_probe(struct i2c_client *client,
>  						const struct i2c_device_id *id)
>  {
>  	struct iio_dev *indio_dev;
> -	struct st_sensor_data *pdata;
> +	struct st_sensor_data *press_data;
>  	int err;
>  
> -	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*pdata));
> +	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*press_data));
>  	if (!indio_dev)
>  		return -ENOMEM;
>  
> -	pdata = iio_priv(indio_dev);
> -	pdata->dev = &client->dev;
> +	press_data = iio_priv(indio_dev);
> +	press_data->dev = &client->dev;
>  	st_sensors_of_i2c_probe(client, st_press_of_match);
>  
> -	st_sensors_i2c_configure(indio_dev, client, pdata);
> +	st_sensors_i2c_configure(indio_dev, client, press_data);
>  
>  	err = st_press_common_probe(indio_dev);
>  	if (err < 0)
> diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c
> index 98c3e8e..10c9624 100644
> --- a/drivers/iio/pressure/st_pressure_spi.c
> +++ b/drivers/iio/pressure/st_pressure_spi.c
> @@ -21,17 +21,17 @@
>  static int st_press_spi_probe(struct spi_device *spi)
>  {
>  	struct iio_dev *indio_dev;
> -	struct st_sensor_data *pdata;
> +	struct st_sensor_data *press_data;
>  	int err;
>  
> -	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*pdata));
> +	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*press_data));
>  	if (indio_dev == NULL)
>  		return -ENOMEM;
>  
> -	pdata = iio_priv(indio_dev);
> -	pdata->dev = &spi->dev;
> +	press_data = iio_priv(indio_dev);
> +	press_data->dev = &spi->dev;
>  
> -	st_sensors_spi_configure(indio_dev, spi, pdata);
> +	st_sensors_spi_configure(indio_dev, spi, press_data);
>  
>  	err = st_press_common_probe(indio_dev);
>  	if (err < 0)
> 

[PATCH 7/7] iio:common: Set the device pointer into ST common sensors library

[Denis CIOCCA]

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
---
 drivers/iio/accel/st_accel_i2c.c               | 1 -
 drivers/iio/accel/st_accel_spi.c               | 1 -
 drivers/iio/common/st_sensors/st_sensors_i2c.c | 1 +
 drivers/iio/common/st_sensors/st_sensors_spi.c | 1 +
 drivers/iio/gyro/st_gyro_i2c.c                 | 1 -
 drivers/iio/gyro/st_gyro_spi.c                 | 1 -
 drivers/iio/magnetometer/st_magn_i2c.c         | 1 -
 drivers/iio/magnetometer/st_magn_spi.c         | 1 -
 drivers/iio/pressure/st_pressure_i2c.c         | 1 -
 drivers/iio/pressure/st_pressure_spi.c         | 1 -
 10 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index 40adc7e..c7246bd 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -79,7 +79,6 @@ static int st_accel_i2c_probe(struct i2c_client *client,
 		return -ENOMEM;
 
 	adata = iio_priv(indio_dev);
-	adata->dev = &client->dev;
 	st_sensors_of_i2c_probe(client, st_accel_of_match);
 
 	st_sensors_i2c_configure(indio_dev, client, adata);
diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
index 2090d80..12ec293 100644
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -29,7 +29,6 @@ static int st_accel_spi_probe(struct spi_device *spi)
 		return -ENOMEM;
 
 	adata = iio_priv(indio_dev);
-	adata->dev = &spi->dev;
 
 	st_sensors_spi_configure(indio_dev, spi, adata);
 
diff --git a/drivers/iio/common/st_sensors/st_sensors_i2c.c b/drivers/iio/common/st_sensors/st_sensors_i2c.c
index bb6f308..98cfee29 100644
--- a/drivers/iio/common/st_sensors/st_sensors_i2c.c
+++ b/drivers/iio/common/st_sensors/st_sensors_i2c.c
@@ -72,6 +72,7 @@ void st_sensors_i2c_configure(struct iio_dev *indio_dev,
 	indio_dev->dev.parent = &client->dev;
 	indio_dev->name = client->name;
 
+	sdata->dev = &client->dev;
 	sdata->tf = &st_sensors_tf_i2c;
 	sdata->get_irq_data_ready = st_sensors_i2c_get_irq;
 }
diff --git a/drivers/iio/common/st_sensors/st_sensors_spi.c b/drivers/iio/common/st_sensors/st_sensors_spi.c
index 251baf6..78a6a1a 100644
--- a/drivers/iio/common/st_sensors/st_sensors_spi.c
+++ b/drivers/iio/common/st_sensors/st_sensors_spi.c
@@ -111,6 +111,7 @@ void st_sensors_spi_configure(struct iio_dev *indio_dev,
 	indio_dev->dev.parent = &spi->dev;
 	indio_dev->name = spi->modalias;
 
+	sdata->dev = &spi->dev;
 	sdata->tf = &st_sensors_tf_spi;
 	sdata->get_irq_data_ready = st_sensors_spi_get_irq;
 }
diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
index 94d01fb..64480b1 100644
--- a/drivers/iio/gyro/st_gyro_i2c.c
+++ b/drivers/iio/gyro/st_gyro_i2c.c
@@ -67,7 +67,6 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
 		return -ENOMEM;
 
 	gdata = iio_priv(indio_dev);
-	gdata->dev = &client->dev;
 	st_sensors_of_i2c_probe(client, st_gyro_of_match);
 
 	st_sensors_i2c_configure(indio_dev, client, gdata);
diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c
index 3e7a01a..e59bead 100644
--- a/drivers/iio/gyro/st_gyro_spi.c
+++ b/drivers/iio/gyro/st_gyro_spi.c
@@ -29,7 +29,6 @@ static int st_gyro_spi_probe(struct spi_device *spi)
 		return -ENOMEM;
 
 	gdata = iio_priv(indio_dev);
-	gdata->dev = &spi->dev;
 
 	st_sensors_spi_configure(indio_dev, spi, gdata);
 
diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
index f8a6823..92e5c15 100644
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -51,7 +51,6 @@ static int st_magn_i2c_probe(struct i2c_client *client,
 		return -ENOMEM;
 
 	mdata = iio_priv(indio_dev);
-	mdata->dev = &client->dev;
 	st_sensors_of_i2c_probe(client, st_magn_of_match);
 
 	st_sensors_i2c_configure(indio_dev, client, mdata);
diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
index f642142..7adacf1 100644
--- a/drivers/iio/magnetometer/st_magn_spi.c
+++ b/drivers/iio/magnetometer/st_magn_spi.c
@@ -29,7 +29,6 @@ static int st_magn_spi_probe(struct spi_device *spi)
 		return -ENOMEM;
 
 	mdata = iio_priv(indio_dev);
-	mdata->dev = &spi->dev;
 
 	st_sensors_spi_configure(indio_dev, spi, mdata);
 
diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
index 8859e93..137788b 100644
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -51,7 +51,6 @@ static int st_press_i2c_probe(struct i2c_client *client,
 		return -ENOMEM;
 
 	press_data = iio_priv(indio_dev);
-	press_data->dev = &client->dev;
 	st_sensors_of_i2c_probe(client, st_press_of_match);
 
 	st_sensors_i2c_configure(indio_dev, client, press_data);
diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c
index 10c9624..1ffa6d4 100644
--- a/drivers/iio/pressure/st_pressure_spi.c
+++ b/drivers/iio/pressure/st_pressure_spi.c
@@ -29,7 +29,6 @@ static int st_press_spi_probe(struct spi_device *spi)
 		return -ENOMEM;
 
 	press_data = iio_priv(indio_dev);
-	press_data->dev = &spi->dev;
 
 	st_sensors_spi_configure(indio_dev, spi, press_data);
 
-- 
1.9.1

Re: [PATCH 7/7] iio:common: Set the device pointer into ST common sensors library

[Jonathan Cameron]

On 03/10/14 16:35, Denis CIOCCA wrote:
> Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Applied.
> ---
>  drivers/iio/accel/st_accel_i2c.c               | 1 -
>  drivers/iio/accel/st_accel_spi.c               | 1 -
>  drivers/iio/common/st_sensors/st_sensors_i2c.c | 1 +
>  drivers/iio/common/st_sensors/st_sensors_spi.c | 1 +
>  drivers/iio/gyro/st_gyro_i2c.c                 | 1 -
>  drivers/iio/gyro/st_gyro_spi.c                 | 1 -
>  drivers/iio/magnetometer/st_magn_i2c.c         | 1 -
>  drivers/iio/magnetometer/st_magn_spi.c         | 1 -
>  drivers/iio/pressure/st_pressure_i2c.c         | 1 -
>  drivers/iio/pressure/st_pressure_spi.c         | 1 -
>  10 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
> index 40adc7e..c7246bd 100644
> --- a/drivers/iio/accel/st_accel_i2c.c
> +++ b/drivers/iio/accel/st_accel_i2c.c
> @@ -79,7 +79,6 @@ static int st_accel_i2c_probe(struct i2c_client *client,
>  		return -ENOMEM;
>  
>  	adata = iio_priv(indio_dev);
> -	adata->dev = &client->dev;
>  	st_sensors_of_i2c_probe(client, st_accel_of_match);
>  
>  	st_sensors_i2c_configure(indio_dev, client, adata);
> diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
> index 2090d80..12ec293 100644
> --- a/drivers/iio/accel/st_accel_spi.c
> +++ b/drivers/iio/accel/st_accel_spi.c
> @@ -29,7 +29,6 @@ static int st_accel_spi_probe(struct spi_device *spi)
>  		return -ENOMEM;
>  
>  	adata = iio_priv(indio_dev);
> -	adata->dev = &spi->dev;
>  
>  	st_sensors_spi_configure(indio_dev, spi, adata);
>  
> diff --git a/drivers/iio/common/st_sensors/st_sensors_i2c.c b/drivers/iio/common/st_sensors/st_sensors_i2c.c
> index bb6f308..98cfee29 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_i2c.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_i2c.c
> @@ -72,6 +72,7 @@ void st_sensors_i2c_configure(struct iio_dev *indio_dev,
>  	indio_dev->dev.parent = &client->dev;
>  	indio_dev->name = client->name;
>  
> +	sdata->dev = &client->dev;
>  	sdata->tf = &st_sensors_tf_i2c;
>  	sdata->get_irq_data_ready = st_sensors_i2c_get_irq;
>  }
> diff --git a/drivers/iio/common/st_sensors/st_sensors_spi.c b/drivers/iio/common/st_sensors/st_sensors_spi.c
> index 251baf6..78a6a1a 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_spi.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_spi.c
> @@ -111,6 +111,7 @@ void st_sensors_spi_configure(struct iio_dev *indio_dev,
>  	indio_dev->dev.parent = &spi->dev;
>  	indio_dev->name = spi->modalias;
>  
> +	sdata->dev = &spi->dev;
>  	sdata->tf = &st_sensors_tf_spi;
>  	sdata->get_irq_data_ready = st_sensors_spi_get_irq;
>  }
> diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
> index 94d01fb..64480b1 100644
> --- a/drivers/iio/gyro/st_gyro_i2c.c
> +++ b/drivers/iio/gyro/st_gyro_i2c.c
> @@ -67,7 +67,6 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
>  		return -ENOMEM;
>  
>  	gdata = iio_priv(indio_dev);
> -	gdata->dev = &client->dev;
>  	st_sensors_of_i2c_probe(client, st_gyro_of_match);
>  
>  	st_sensors_i2c_configure(indio_dev, client, gdata);
> diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c
> index 3e7a01a..e59bead 100644
> --- a/drivers/iio/gyro/st_gyro_spi.c
> +++ b/drivers/iio/gyro/st_gyro_spi.c
> @@ -29,7 +29,6 @@ static int st_gyro_spi_probe(struct spi_device *spi)
>  		return -ENOMEM;
>  
>  	gdata = iio_priv(indio_dev);
> -	gdata->dev = &spi->dev;
>  
>  	st_sensors_spi_configure(indio_dev, spi, gdata);
>  
> diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
> index f8a6823..92e5c15 100644
> --- a/drivers/iio/magnetometer/st_magn_i2c.c
> +++ b/drivers/iio/magnetometer/st_magn_i2c.c
> @@ -51,7 +51,6 @@ static int st_magn_i2c_probe(struct i2c_client *client,
>  		return -ENOMEM;
>  
>  	mdata = iio_priv(indio_dev);
> -	mdata->dev = &client->dev;
>  	st_sensors_of_i2c_probe(client, st_magn_of_match);
>  
>  	st_sensors_i2c_configure(indio_dev, client, mdata);
> diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
> index f642142..7adacf1 100644
> --- a/drivers/iio/magnetometer/st_magn_spi.c
> +++ b/drivers/iio/magnetometer/st_magn_spi.c
> @@ -29,7 +29,6 @@ static int st_magn_spi_probe(struct spi_device *spi)
>  		return -ENOMEM;
>  
>  	mdata = iio_priv(indio_dev);
> -	mdata->dev = &spi->dev;
>  
>  	st_sensors_spi_configure(indio_dev, spi, mdata);
>  
> diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
> index 8859e93..137788b 100644
> --- a/drivers/iio/pressure/st_pressure_i2c.c
> +++ b/drivers/iio/pressure/st_pressure_i2c.c
> @@ -51,7 +51,6 @@ static int st_press_i2c_probe(struct i2c_client *client,
>  		return -ENOMEM;
>  
>  	press_data = iio_priv(indio_dev);
> -	press_data->dev = &client->dev;
>  	st_sensors_of_i2c_probe(client, st_press_of_match);
>  
>  	st_sensors_i2c_configure(indio_dev, client, press_data);
> diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c
> index 10c9624..1ffa6d4 100644
> --- a/drivers/iio/pressure/st_pressure_spi.c
> +++ b/drivers/iio/pressure/st_pressure_spi.c
> @@ -29,7 +29,6 @@ static int st_press_spi_probe(struct spi_device *spi)
>  		return -ENOMEM;
>  
>  	press_data = iio_priv(indio_dev);
> -	press_data->dev = &spi->dev;
>  
>  	st_sensors_spi_configure(indio_dev, spi, press_data);
>  
> 

Re: [PATCH 1/7] iio:imu: changed structure name from st_sensors to st_sensor_settings

[Jonathan Cameron]

On 03/10/14 16:35, Denis CIOCCA wrote:
> This patch change structure name and related variables names.
> 
> Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
That's a better name choice.  However, you should have made it clear somewhere
that that is the change for this new patch series!

Applied to the togreg branch of iio.git initially pushed out as testing
for the autobuilders to play.
> ---
>  drivers/iio/accel/st_accel_core.c               |  13 +--
>  drivers/iio/common/st_sensors/st_sensors_core.c | 126 +++++++++++++-----------
>  drivers/iio/gyro/st_gyro_core.c                 |  13 +--
>  drivers/iio/magnetometer/st_magn_core.c         |  13 +--
>  drivers/iio/pressure/st_pressure_core.c         |  20 ++--
>  include/linux/iio/common/st_sensors.h           |  10 +-
>  6 files changed, 104 insertions(+), 91 deletions(-)
> 
> diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
> index 0878648..7cbdfae 100644
> --- a/drivers/iio/accel/st_accel_core.c
> +++ b/drivers/iio/accel/st_accel_core.c
> @@ -161,7 +161,7 @@ static const struct iio_chan_spec st_accel_16bit_channels[] = {
>  	IIO_CHAN_SOFT_TIMESTAMP(3)
>  };
>  
> -static const struct st_sensors st_accel_sensors[] = {
> +static const struct st_sensor_settings st_accel_sensors_settings[] = {
>  	{
>  		.wai = ST_ACCEL_1_WAI_EXP,
>  		.sensors_supported = {
> @@ -470,18 +470,19 @@ int st_accel_common_probe(struct iio_dev *indio_dev,
>  	st_sensors_power_enable(indio_dev);
>  
>  	err = st_sensors_check_device_support(indio_dev,
> -				ARRAY_SIZE(st_accel_sensors), st_accel_sensors);
> +					ARRAY_SIZE(st_accel_sensors_settings),
> +					st_accel_sensors_settings);
>  	if (err < 0)
>  		return err;
>  
>  	adata->num_data_channels = ST_ACCEL_NUMBER_DATA_CHANNELS;
> -	adata->multiread_bit = adata->sensor->multi_read_bit;
> -	indio_dev->channels = adata->sensor->ch;
> +	adata->multiread_bit = adata->sensor_settings->multi_read_bit;
> +	indio_dev->channels = adata->sensor_settings->ch;
>  	indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
>  
>  	adata->current_fullscale = (struct st_sensor_fullscale_avl *)
> -						&adata->sensor->fs.fs_avl[0];
> -	adata->odr = adata->sensor->odr.odr_avl[0].hz;
> +					&adata->sensor_settings->fs.fs_avl[0];
> +	adata->odr = adata->sensor_settings->odr.odr_avl[0].hz;
>  
>  	if (!plat_data)
>  		plat_data =
> diff --git a/drivers/iio/common/st_sensors/st_sensors_core.c b/drivers/iio/common/st_sensors/st_sensors_core.c
> index 24cfe4e..edd13d2 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_core.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_core.c
> @@ -44,18 +44,18 @@ st_sensors_write_data_with_mask_error:
>  	return err;
>  }
>  
> -static int st_sensors_match_odr(struct st_sensors *sensor,
> +static int st_sensors_match_odr(struct st_sensor_settings *sensor_settings,
>  			unsigned int odr, struct st_sensor_odr_avl *odr_out)
>  {
>  	int i, ret = -EINVAL;
>  
>  	for (i = 0; i < ST_SENSORS_ODR_LIST_MAX; i++) {
> -		if (sensor->odr.odr_avl[i].hz == 0)
> +		if (sensor_settings->odr.odr_avl[i].hz == 0)
>  			goto st_sensors_match_odr_error;
>  
> -		if (sensor->odr.odr_avl[i].hz == odr) {
> -			odr_out->hz = sensor->odr.odr_avl[i].hz;
> -			odr_out->value = sensor->odr.odr_avl[i].value;
> +		if (sensor_settings->odr.odr_avl[i].hz == odr) {
> +			odr_out->hz = sensor_settings->odr.odr_avl[i].hz;
> +			odr_out->value = sensor_settings->odr.odr_avl[i].value;
>  			ret = 0;
>  			break;
>  		}
> @@ -71,23 +71,26 @@ int st_sensors_set_odr(struct iio_dev *indio_dev, unsigned int odr)
>  	struct st_sensor_odr_avl odr_out = {0, 0};
>  	struct st_sensor_data *sdata = iio_priv(indio_dev);
>  
> -	err = st_sensors_match_odr(sdata->sensor, odr, &odr_out);
> +	err = st_sensors_match_odr(sdata->sensor_settings, odr, &odr_out);
>  	if (err < 0)
>  		goto st_sensors_match_odr_error;
>  
> -	if ((sdata->sensor->odr.addr == sdata->sensor->pw.addr) &&
> -			(sdata->sensor->odr.mask == sdata->sensor->pw.mask)) {
> +	if ((sdata->sensor_settings->odr.addr ==
> +					sdata->sensor_settings->pw.addr) &&
> +				(sdata->sensor_settings->odr.mask ==
> +					sdata->sensor_settings->pw.mask)) {
>  		if (sdata->enabled == true) {
>  			err = st_sensors_write_data_with_mask(indio_dev,
> -				sdata->sensor->odr.addr,
> -				sdata->sensor->odr.mask,
> +				sdata->sensor_settings->odr.addr,
> +				sdata->sensor_settings->odr.mask,
>  				odr_out.value);
>  		} else {
>  			err = 0;
>  		}
>  	} else {
>  		err = st_sensors_write_data_with_mask(indio_dev,
> -			sdata->sensor->odr.addr, sdata->sensor->odr.mask,
> +			sdata->sensor_settings->odr.addr,
> +			sdata->sensor_settings->odr.mask,
>  			odr_out.value);
>  	}
>  	if (err >= 0)
> @@ -98,16 +101,16 @@ st_sensors_match_odr_error:
>  }
>  EXPORT_SYMBOL(st_sensors_set_odr);
>  
> -static int st_sensors_match_fs(struct st_sensors *sensor,
> +static int st_sensors_match_fs(struct st_sensor_settings *sensor_settings,
>  					unsigned int fs, int *index_fs_avl)
>  {
>  	int i, ret = -EINVAL;
>  
>  	for (i = 0; i < ST_SENSORS_FULLSCALE_AVL_MAX; i++) {
> -		if (sensor->fs.fs_avl[i].num == 0)
> +		if (sensor_settings->fs.fs_avl[i].num == 0)
>  			goto st_sensors_match_odr_error;
>  
> -		if (sensor->fs.fs_avl[i].num == fs) {
> +		if (sensor_settings->fs.fs_avl[i].num == fs) {
>  			*index_fs_avl = i;
>  			ret = 0;
>  			break;
> @@ -118,25 +121,24 @@ st_sensors_match_odr_error:
>  	return ret;
>  }
>  
> -static int st_sensors_set_fullscale(struct iio_dev *indio_dev,
> -								unsigned int fs)
> +static int st_sensors_set_fullscale(struct iio_dev *indio_dev, unsigned int fs)
>  {
>  	int err, i = 0;
>  	struct st_sensor_data *sdata = iio_priv(indio_dev);
>  
> -	err = st_sensors_match_fs(sdata->sensor, fs, &i);
> +	err = st_sensors_match_fs(sdata->sensor_settings, fs, &i);
>  	if (err < 0)
>  		goto st_accel_set_fullscale_error;
>  
>  	err = st_sensors_write_data_with_mask(indio_dev,
> -				sdata->sensor->fs.addr,
> -				sdata->sensor->fs.mask,
> -				sdata->sensor->fs.fs_avl[i].value);
> +				sdata->sensor_settings->fs.addr,
> +				sdata->sensor_settings->fs.mask,
> +				sdata->sensor_settings->fs.fs_avl[i].value);
>  	if (err < 0)
>  		goto st_accel_set_fullscale_error;
>  
>  	sdata->current_fullscale = (struct st_sensor_fullscale_avl *)
> -						&sdata->sensor->fs.fs_avl[i];
> +					&sdata->sensor_settings->fs.fs_avl[i];
>  	return err;
>  
>  st_accel_set_fullscale_error:
> @@ -153,10 +155,12 @@ int st_sensors_set_enable(struct iio_dev *indio_dev, bool enable)
>  	struct st_sensor_data *sdata = iio_priv(indio_dev);
>  
>  	if (enable) {
> -		tmp_value = sdata->sensor->pw.value_on;
> -		if ((sdata->sensor->odr.addr == sdata->sensor->pw.addr) &&
> -			(sdata->sensor->odr.mask == sdata->sensor->pw.mask)) {
> -			err = st_sensors_match_odr(sdata->sensor,
> +		tmp_value = sdata->sensor_settings->pw.value_on;
> +		if ((sdata->sensor_settings->odr.addr ==
> +					sdata->sensor_settings->pw.addr) &&
> +				(sdata->sensor_settings->odr.mask ==
> +					sdata->sensor_settings->pw.mask)) {
> +			err = st_sensors_match_odr(sdata->sensor_settings,
>  							sdata->odr, &odr_out);
>  			if (err < 0)
>  				goto set_enable_error;
> @@ -164,8 +168,8 @@ int st_sensors_set_enable(struct iio_dev *indio_dev, bool enable)
>  			found = true;
>  		}
>  		err = st_sensors_write_data_with_mask(indio_dev,
> -				sdata->sensor->pw.addr,
> -				sdata->sensor->pw.mask, tmp_value);
> +				sdata->sensor_settings->pw.addr,
> +				sdata->sensor_settings->pw.mask, tmp_value);
>  		if (err < 0)
>  			goto set_enable_error;
>  
> @@ -175,9 +179,9 @@ int st_sensors_set_enable(struct iio_dev *indio_dev, bool enable)
>  			sdata->odr = odr_out.hz;
>  	} else {
>  		err = st_sensors_write_data_with_mask(indio_dev,
> -				sdata->sensor->pw.addr,
> -				sdata->sensor->pw.mask,
> -				sdata->sensor->pw.value_off);
> +				sdata->sensor_settings->pw.addr,
> +				sdata->sensor_settings->pw.mask,
> +				sdata->sensor_settings->pw.value_off);
>  		if (err < 0)
>  			goto set_enable_error;
>  
> @@ -194,8 +198,9 @@ int st_sensors_set_axis_enable(struct iio_dev *indio_dev, u8 axis_enable)
>  	struct st_sensor_data *sdata = iio_priv(indio_dev);
>  
>  	return st_sensors_write_data_with_mask(indio_dev,
> -				sdata->sensor->enable_axis.addr,
> -				sdata->sensor->enable_axis.mask, axis_enable);
> +				sdata->sensor_settings->enable_axis.addr,
> +				sdata->sensor_settings->enable_axis.mask,
> +				axis_enable);
>  }
>  EXPORT_SYMBOL(st_sensors_set_axis_enable);
>  
> @@ -236,13 +241,13 @@ void st_sensors_power_disable(struct iio_dev *indio_dev)
>  EXPORT_SYMBOL(st_sensors_power_disable);
>  
>  static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev,
> -				       struct st_sensors_platform_data *pdata)
> +					struct st_sensors_platform_data *pdata)
>  {
>  	struct st_sensor_data *sdata = iio_priv(indio_dev);
>  
>  	switch (pdata->drdy_int_pin) {
>  	case 1:
> -		if (sdata->sensor->drdy_irq.mask_int1 == 0) {
> +		if (sdata->sensor_settings->drdy_irq.mask_int1 == 0) {
>  			dev_err(&indio_dev->dev,
>  					"DRDY on INT1 not available.\n");
>  			return -EINVAL;
> @@ -250,7 +255,7 @@ static int st_sensors_set_drdy_int_pin(struct iio_dev *indio_dev,
>  		sdata->drdy_int_pin = 1;
>  		break;
>  	case 2:
> -		if (sdata->sensor->drdy_irq.mask_int2 == 0) {
> +		if (sdata->sensor_settings->drdy_irq.mask_int2 == 0) {
>  			dev_err(&indio_dev->dev,
>  					"DRDY on INT2 not available.\n");
>  			return -EINVAL;
> @@ -318,7 +323,7 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
>  
>  	if (sdata->current_fullscale) {
>  		err = st_sensors_set_fullscale(indio_dev,
> -					       sdata->current_fullscale->num);
> +						sdata->current_fullscale->num);
>  		if (err < 0)
>  			return err;
>  	} else
> @@ -330,7 +335,8 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev,
>  
>  	/* set BDU */
>  	err = st_sensors_write_data_with_mask(indio_dev,
> -			sdata->sensor->bdu.addr, sdata->sensor->bdu.mask, true);
> +					sdata->sensor_settings->bdu.addr,
> +					sdata->sensor_settings->bdu.mask, true);
>  	if (err < 0)
>  		return err;
>  
> @@ -346,26 +352,28 @@ int st_sensors_set_dataready_irq(struct iio_dev *indio_dev, bool enable)
>  	u8 drdy_mask;
>  	struct st_sensor_data *sdata = iio_priv(indio_dev);
>  
> -	if (!sdata->sensor->drdy_irq.addr)
> +	if (!sdata->sensor_settings->drdy_irq.addr)
>  		return 0;
>  
>  	/* Enable/Disable the interrupt generator 1. */
> -	if (sdata->sensor->drdy_irq.ig1.en_addr > 0) {
> +	if (sdata->sensor_settings->drdy_irq.ig1.en_addr > 0) {
>  		err = st_sensors_write_data_with_mask(indio_dev,
> -			sdata->sensor->drdy_irq.ig1.en_addr,
> -			sdata->sensor->drdy_irq.ig1.en_mask, (int)enable);
> +				sdata->sensor_settings->drdy_irq.ig1.en_addr,
> +				sdata->sensor_settings->drdy_irq.ig1.en_mask,
> +				(int)enable);
>  		if (err < 0)
>  			goto st_accel_set_dataready_irq_error;
>  	}
>  
>  	if (sdata->drdy_int_pin == 1)
> -		drdy_mask = sdata->sensor->drdy_irq.mask_int1;
> +		drdy_mask = sdata->sensor_settings->drdy_irq.mask_int1;
>  	else
> -		drdy_mask = sdata->sensor->drdy_irq.mask_int2;
> +		drdy_mask = sdata->sensor_settings->drdy_irq.mask_int2;
>  
>  	/* Enable/Disable the interrupt generator for data ready. */
>  	err = st_sensors_write_data_with_mask(indio_dev,
> -			sdata->sensor->drdy_irq.addr, drdy_mask, (int)enable);
> +					sdata->sensor_settings->drdy_irq.addr,
> +					drdy_mask, (int)enable);
>  
>  st_accel_set_dataready_irq_error:
>  	return err;
> @@ -378,8 +386,8 @@ int st_sensors_set_fullscale_by_gain(struct iio_dev *indio_dev, int scale)
>  	struct st_sensor_data *sdata = iio_priv(indio_dev);
>  
>  	for (i = 0; i < ST_SENSORS_FULLSCALE_AVL_MAX; i++) {
> -		if ((sdata->sensor->fs.fs_avl[i].gain == scale) &&
> -				(sdata->sensor->fs.fs_avl[i].gain != 0)) {
> +		if ((sdata->sensor_settings->fs.fs_avl[i].gain == scale) &&
> +				(sdata->sensor_settings->fs.fs_avl[i].gain != 0)) {
>  			err = 0;
>  			break;
>  		}
> @@ -388,7 +396,7 @@ int st_sensors_set_fullscale_by_gain(struct iio_dev *indio_dev, int scale)
>  		goto st_sensors_match_scale_error;
>  
>  	err = st_sensors_set_fullscale(indio_dev,
> -					sdata->sensor->fs.fs_avl[i].num);
> +				sdata->sensor_settings->fs.fs_avl[i].num);
>  
>  st_sensors_match_scale_error:
>  	return err;
> @@ -439,7 +447,7 @@ int st_sensors_read_info_raw(struct iio_dev *indio_dev,
>  		if (err < 0)
>  			goto out;
>  
> -		msleep((sdata->sensor->bootime * 1000) / sdata->odr);
> +		msleep((sdata->sensor_settings->bootime * 1000) / sdata->odr);
>  		err = st_sensors_read_axis_data(indio_dev, ch, val);
>  		if (err < 0)
>  			goto out;
> @@ -456,7 +464,8 @@ out:
>  EXPORT_SYMBOL(st_sensors_read_info_raw);
>  
>  int st_sensors_check_device_support(struct iio_dev *indio_dev,
> -			int num_sensors_list, const struct st_sensors *sensors)
> +			int num_sensors_list,
> +			const struct st_sensor_settings *sensor_settings)
>  {
>  	u8 wai;
>  	int i, n, err;
> @@ -470,23 +479,24 @@ int st_sensors_check_device_support(struct iio_dev *indio_dev,
>  	}
>  
>  	for (i = 0; i < num_sensors_list; i++) {
> -		if (sensors[i].wai == wai)
> +		if (sensor_settings[i].wai == wai)
>  			break;
>  	}
>  	if (i == num_sensors_list)
>  		goto device_not_supported;
>  
> -	for (n = 0; n < ARRAY_SIZE(sensors[i].sensors_supported); n++) {
> +	for (n = 0; n < ARRAY_SIZE(sensor_settings[i].sensors_supported); n++) {
>  		if (strcmp(indio_dev->name,
> -				&sensors[i].sensors_supported[n][0]) == 0)
> +				&sensor_settings[i].sensors_supported[n][0]) == 0)
>  			break;
>  	}
> -	if (n == ARRAY_SIZE(sensors[i].sensors_supported)) {
> +	if (n == ARRAY_SIZE(sensor_settings[i].sensors_supported)) {
>  		dev_err(&indio_dev->dev, "device name and WhoAmI mismatch.\n");
>  		goto sensor_name_mismatch;
>  	}
>  
> -	sdata->sensor = (struct st_sensors *)&sensors[i];
> +	sdata->sensor_settings =
> +			(struct st_sensor_settings *)&sensor_settings[i];
>  
>  	return i;
>  
> @@ -508,11 +518,11 @@ ssize_t st_sensors_sysfs_sampling_frequency_avail(struct device *dev,
>  
>  	mutex_lock(&indio_dev->mlock);
>  	for (i = 0; i < ST_SENSORS_ODR_LIST_MAX; i++) {
> -		if (sdata->sensor->odr.odr_avl[i].hz == 0)
> +		if (sdata->sensor_settings->odr.odr_avl[i].hz == 0)
>  			break;
>  
>  		len += scnprintf(buf + len, PAGE_SIZE - len, "%d ",
> -					sdata->sensor->odr.odr_avl[i].hz);
> +				sdata->sensor_settings->odr.odr_avl[i].hz);
>  	}
>  	mutex_unlock(&indio_dev->mlock);
>  	buf[len - 1] = '\n';
> @@ -530,11 +540,11 @@ ssize_t st_sensors_sysfs_scale_avail(struct device *dev,
>  
>  	mutex_lock(&indio_dev->mlock);
>  	for (i = 0; i < ST_SENSORS_FULLSCALE_AVL_MAX; i++) {
> -		if (sdata->sensor->fs.fs_avl[i].num == 0)
> +		if (sdata->sensor_settings->fs.fs_avl[i].num == 0)
>  			break;
>  
>  		len += scnprintf(buf + len, PAGE_SIZE - len, "0.%06u ",
> -					sdata->sensor->fs.fs_avl[i].gain);
> +				sdata->sensor_settings->fs.fs_avl[i].gain);
>  	}
>  	mutex_unlock(&indio_dev->mlock);
>  	buf[len - 1] = '\n';
> diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
> index f156fc6..9d41b68 100644
> --- a/drivers/iio/gyro/st_gyro_core.c
> +++ b/drivers/iio/gyro/st_gyro_core.c
> @@ -103,7 +103,7 @@ static const struct iio_chan_spec st_gyro_16bit_channels[] = {
>  	IIO_CHAN_SOFT_TIMESTAMP(3)
>  };
>  
> -static const struct st_sensors st_gyro_sensors[] = {
> +static const struct st_sensor_settings st_gyro_sensors_settings[] = {
>  	{
>  		.wai = ST_GYRO_1_WAI_EXP,
>  		.sensors_supported = {
> @@ -322,18 +322,19 @@ int st_gyro_common_probe(struct iio_dev *indio_dev,
>  	st_sensors_power_enable(indio_dev);
>  
>  	err = st_sensors_check_device_support(indio_dev,
> -				ARRAY_SIZE(st_gyro_sensors), st_gyro_sensors);
> +					ARRAY_SIZE(st_gyro_sensors_settings),
> +					st_gyro_sensors_settings);
>  	if (err < 0)
>  		return err;
>  
>  	gdata->num_data_channels = ST_GYRO_NUMBER_DATA_CHANNELS;
> -	gdata->multiread_bit = gdata->sensor->multi_read_bit;
> -	indio_dev->channels = gdata->sensor->ch;
> +	gdata->multiread_bit = gdata->sensor_settings->multi_read_bit;
> +	indio_dev->channels = gdata->sensor_settings->ch;
>  	indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
>  
>  	gdata->current_fullscale = (struct st_sensor_fullscale_avl *)
> -						&gdata->sensor->fs.fs_avl[0];
> -	gdata->odr = gdata->sensor->odr.odr_avl[0].hz;
> +					&gdata->sensor_settings->fs.fs_avl[0];
> +	gdata->odr = gdata->sensor_settings->odr.odr_avl[0].hz;
>  
>  	err = st_sensors_init_sensor(indio_dev, pdata);
>  	if (err < 0)
> diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
> index 68cae86..b422620 100644
> --- a/drivers/iio/magnetometer/st_magn_core.c
> +++ b/drivers/iio/magnetometer/st_magn_core.c
> @@ -149,7 +149,7 @@ static const struct iio_chan_spec st_magn_2_16bit_channels[] = {
>  	IIO_CHAN_SOFT_TIMESTAMP(3)
>  };
>  
> -static const struct st_sensors st_magn_sensors[] = {
> +static const struct st_sensor_settings st_magn_sensors_settings[] = {
>  	{
>  		.wai = ST_MAGN_1_WAI_EXP,
>  		.sensors_supported = {
> @@ -374,18 +374,19 @@ int st_magn_common_probe(struct iio_dev *indio_dev,
>  	st_sensors_power_enable(indio_dev);
>  
>  	err = st_sensors_check_device_support(indio_dev,
> -				ARRAY_SIZE(st_magn_sensors), st_magn_sensors);
> +					ARRAY_SIZE(st_magn_sensors_settings),
> +					st_magn_sensors_settings);
>  	if (err < 0)
>  		return err;
>  
>  	mdata->num_data_channels = ST_MAGN_NUMBER_DATA_CHANNELS;
> -	mdata->multiread_bit = mdata->sensor->multi_read_bit;
> -	indio_dev->channels = mdata->sensor->ch;
> +	mdata->multiread_bit = mdata->sensor_settings->multi_read_bit;
> +	indio_dev->channels = mdata->sensor_settings->ch;
>  	indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
>  
>  	mdata->current_fullscale = (struct st_sensor_fullscale_avl *)
> -						&mdata->sensor->fs.fs_avl[0];
> -	mdata->odr = mdata->sensor->odr.odr_avl[0].hz;
> +					&mdata->sensor_settings->fs.fs_avl[0];
> +	mdata->odr = mdata->sensor_settings->odr.odr_avl[0].hz;
>  
>  	err = st_sensors_init_sensor(indio_dev, pdata);
>  	if (err < 0)
> diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
> index 473d914..9563118 100644
> --- a/drivers/iio/pressure/st_pressure_core.c
> +++ b/drivers/iio/pressure/st_pressure_core.c
> @@ -175,7 +175,7 @@ static const struct iio_chan_spec st_press_lps001wp_channels[] = {
>  	IIO_CHAN_SOFT_TIMESTAMP(1)
>  };
>  
> -static const struct st_sensors st_press_sensors[] = {
> +static const struct st_sensor_settings st_press_sensors_settings[] = {
>  	{
>  		.wai = ST_PRESS_LPS331AP_WAI_EXP,
>  		.sensors_supported = {
> @@ -422,24 +422,24 @@ int st_press_common_probe(struct iio_dev *indio_dev,
>  	st_sensors_power_enable(indio_dev);
>  
>  	err = st_sensors_check_device_support(indio_dev,
> -					      ARRAY_SIZE(st_press_sensors),
> -					      st_press_sensors);
> +					ARRAY_SIZE(st_press_sensors_settings),
> +					st_press_sensors_settings);
>  	if (err < 0)
>  		return err;
>  
>  	pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;
> -	pdata->multiread_bit     = pdata->sensor->multi_read_bit;
> -	indio_dev->channels      = pdata->sensor->ch;
> -	indio_dev->num_channels  = pdata->sensor->num_ch;
> +	pdata->multiread_bit = pdata->sensor_settings->multi_read_bit;
> +	indio_dev->channels = pdata->sensor_settings->ch;
> +	indio_dev->num_channels = pdata->sensor_settings->num_ch;
>  
> -	if (pdata->sensor->fs.addr != 0)
> +	if (pdata->sensor_settings->fs.addr != 0)
>  		pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
> -			&pdata->sensor->fs.fs_avl[0];
> +			&pdata->sensor_settings->fs.fs_avl[0];
>  
> -	pdata->odr = pdata->sensor->odr.odr_avl[0].hz;
> +	pdata->odr = pdata->sensor_settings->odr.odr_avl[0].hz;
>  
>  	/* Some devices don't support a data ready pin. */
> -	if (!plat_data && pdata->sensor->drdy_irq.addr)
> +	if (!plat_data && pdata->sensor_settings->drdy_irq.addr)
>  		plat_data =
>  			(struct st_sensors_platform_data *)&default_press_pdata;
>  
> diff --git a/include/linux/iio/common/st_sensors.h b/include/linux/iio/common/st_sensors.h
> index d8257ab..2c476ac 100644
> --- a/include/linux/iio/common/st_sensors.h
> +++ b/include/linux/iio/common/st_sensors.h
> @@ -164,7 +164,7 @@ struct st_sensor_transfer_function {
>  };
>  
>  /**
> - * struct st_sensors - ST sensors list
> + * struct st_sensor_settings - ST specific sensor settings
>   * @wai: Contents of WhoAmI register.
>   * @sensors_supported: List of supported sensors by struct itself.
>   * @ch: IIO channels for the sensor.
> @@ -177,7 +177,7 @@ struct st_sensor_transfer_function {
>   * @multi_read_bit: Use or not particular bit for [I2C/SPI] multi-read.
>   * @bootime: samples to discard when sensor passing from power-down to power-up.
>   */
> -struct st_sensors {
> +struct st_sensor_settings {
>  	u8 wai;
>  	char sensors_supported[ST_SENSORS_MAX_4WAI][ST_SENSORS_MAX_NAME];
>  	struct iio_chan_spec *ch;
> @@ -196,7 +196,7 @@ struct st_sensors {
>   * struct st_sensor_data - ST sensor device status
>   * @dev: Pointer to instance of struct device (I2C or SPI).
>   * @trig: The trigger in use by the core driver.
> - * @sensor: Pointer to the current sensor struct in use.
> + * @sensor_settings: Pointer to the specific sensor settings in use.
>   * @current_fullscale: Maximum range of measure by the sensor.
>   * @vdd: Pointer to sensor's Vdd power supply
>   * @vdd_io: Pointer to sensor's Vdd-IO power supply
> @@ -213,7 +213,7 @@ struct st_sensors {
>  struct st_sensor_data {
>  	struct device *dev;
>  	struct iio_trigger *trig;
> -	struct st_sensors *sensor;
> +	struct st_sensor_settings *sensor_settings;
>  	struct st_sensor_fullscale_avl *current_fullscale;
>  	struct regulator *vdd;
>  	struct regulator *vdd_io;
> @@ -279,7 +279,7 @@ int st_sensors_read_info_raw(struct iio_dev *indio_dev,
>  				struct iio_chan_spec const *ch, int *val);
>  
>  int st_sensors_check_device_support(struct iio_dev *indio_dev,
> -			int num_sensors_list, const struct st_sensors *sensors);
> +	int num_sensors_list, const struct st_sensor_settings *sensor_settings);
>  
>  ssize_t st_sensors_sysfs_sampling_frequency_avail(struct device *dev,
>  				struct device_attribute *attr, char *buf);
>