aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio/pressure
diff options
context:
space:
mode:
authorDenis CIOCCA <denis.ciocca@st.com>2014-10-03 11:35:35 -0400
committerJonathan Cameron <jic23@kernel.org>2014-10-04 06:23:13 -0400
commita7ee8839daf21c4a3ca439733e7bed25f32e7954 (patch)
treeb46f324ed77940c7a33819a3ac30425580e0d1b0 /drivers/iio/pressure
parentc20d4dffd537bee8d3db5ec28ca871ef73d44078 (diff)
iio:imu: changed structure name from st_sensors to st_sensor_settings
This patch change structure name and related variables names. Signed-off-by: Denis Ciocca <denis.ciocca@st.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/pressure')
-rw-r--r--drivers/iio/pressure/st_pressure_core.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 473d914ef470..9563118c4d36 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[] = {
175 IIO_CHAN_SOFT_TIMESTAMP(1) 175 IIO_CHAN_SOFT_TIMESTAMP(1)
176}; 176};
177 177
178static const struct st_sensors st_press_sensors[] = { 178static const struct st_sensor_settings st_press_sensors_settings[] = {
179 { 179 {
180 .wai = ST_PRESS_LPS331AP_WAI_EXP, 180 .wai = ST_PRESS_LPS331AP_WAI_EXP,
181 .sensors_supported = { 181 .sensors_supported = {
@@ -422,24 +422,24 @@ int st_press_common_probe(struct iio_dev *indio_dev,
422 st_sensors_power_enable(indio_dev); 422 st_sensors_power_enable(indio_dev);
423 423
424 err = st_sensors_check_device_support(indio_dev, 424 err = st_sensors_check_device_support(indio_dev,
425 ARRAY_SIZE(st_press_sensors), 425 ARRAY_SIZE(st_press_sensors_settings),
426 st_press_sensors); 426 st_press_sensors_settings);
427 if (err < 0) 427 if (err < 0)
428 return err; 428 return err;
429 429
430 pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS; 430 pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;
431 pdata->multiread_bit = pdata->sensor->multi_read_bit; 431 pdata->multiread_bit = pdata->sensor_settings->multi_read_bit;
432 indio_dev->channels = pdata->sensor->ch; 432 indio_dev->channels = pdata->sensor_settings->ch;
433 indio_dev->num_channels = pdata->sensor->num_ch; 433 indio_dev->num_channels = pdata->sensor_settings->num_ch;
434 434
435 if (pdata->sensor->fs.addr != 0) 435 if (pdata->sensor_settings->fs.addr != 0)
436 pdata->current_fullscale = (struct st_sensor_fullscale_avl *) 436 pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
437 &pdata->sensor->fs.fs_avl[0]; 437 &pdata->sensor_settings->fs.fs_avl[0];
438 438
439 pdata->odr = pdata->sensor->odr.odr_avl[0].hz; 439 pdata->odr = pdata->sensor_settings->odr.odr_avl[0].hz;
440 440
441 /* Some devices don't support a data ready pin. */ 441 /* Some devices don't support a data ready pin. */
442 if (!plat_data && pdata->sensor->drdy_irq.addr) 442 if (!plat_data && pdata->sensor_settings->drdy_irq.addr)
443 plat_data = 443 plat_data =
444 (struct st_sensors_platform_data *)&default_press_pdata; 444 (struct st_sensors_platform_data *)&default_press_pdata;
445 445