Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iio:pressure: Removed unnecessary parameter on common_probe function

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

authored by

Denis CIOCCA and committed by
Jonathan Cameron
0baa3fc1 2109eb4c

+7 -9
+1 -2
drivers/iio/pressure/st_pressure.h
··· 26 26 .drdy_int_pin = 1, 27 27 }; 28 28 29 - int st_press_common_probe(struct iio_dev *indio_dev, 30 - struct st_sensors_platform_data *pdata); 29 + int st_press_common_probe(struct iio_dev *indio_dev); 31 30 void st_press_common_remove(struct iio_dev *indio_dev); 32 31 33 32 #ifdef CONFIG_IIO_BUFFER
+4 -5
drivers/iio/pressure/st_pressure_core.c
··· 409 409 #define ST_PRESS_TRIGGER_OPS NULL 410 410 #endif 411 411 412 - int st_press_common_probe(struct iio_dev *indio_dev, 413 - struct st_sensors_platform_data *plat_data) 412 + int st_press_common_probe(struct iio_dev *indio_dev) 414 413 { 415 414 struct st_sensor_data *pdata = iio_priv(indio_dev); 416 415 int irq = pdata->get_irq_data_ready(indio_dev); ··· 438 439 pdata->odr = pdata->sensor_settings->odr.odr_avl[0].hz; 439 440 440 441 /* Some devices don't support a data ready pin. */ 441 - if (!plat_data && pdata->sensor_settings->drdy_irq.addr) 442 - plat_data = 442 + if (!pdata->dev->platform_data && pdata->sensor_settings->drdy_irq.addr) 443 + pdata->dev->platform_data = 443 444 (struct st_sensors_platform_data *)&default_press_pdata; 444 445 445 - err = st_sensors_init_sensor(indio_dev, plat_data); 446 + err = st_sensors_init_sensor(indio_dev, pdata->dev->platform_data); 446 447 if (err < 0) 447 448 return err; 448 449
+1 -1
drivers/iio/pressure/st_pressure_i2c.c
··· 56 56 57 57 st_sensors_i2c_configure(indio_dev, client, pdata); 58 58 59 - err = st_press_common_probe(indio_dev, client->dev.platform_data); 59 + err = st_press_common_probe(indio_dev); 60 60 if (err < 0) 61 61 return err; 62 62
+1 -1
drivers/iio/pressure/st_pressure_spi.c
··· 33 33 34 34 st_sensors_spi_configure(indio_dev, spi, pdata); 35 35 36 - err = st_press_common_probe(indio_dev, spi->dev.platform_data); 36 + err = st_press_common_probe(indio_dev); 37 37 if (err < 0) 38 38 return err; 39 39