diff options
author | Denis CIOCCA <denis.ciocca@st.com> | 2014-10-03 11:35:36 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2014-10-04 06:24:33 -0400 |
commit | b6e6bda626972d895322474f41fb64a8a731cc0c (patch) | |
tree | c62c71dad27280d9431f9170c2871fca627d9c9b | |
parent | a7ee8839daf21c4a3ca439733e7bed25f32e7954 (diff) |
iio:accel: Removed unnecessary parameter on common_probe function
Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r-- | drivers/iio/accel/st_accel.h | 3 | ||||
-rw-r--r-- | drivers/iio/accel/st_accel_core.c | 9 | ||||
-rw-r--r-- | drivers/iio/accel/st_accel_i2c.c | 2 | ||||
-rw-r--r-- | 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 c3877630b2e4..fa9646034305 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 = { | |||
33 | .drdy_int_pin = 1, | 33 | .drdy_int_pin = 1, |
34 | }; | 34 | }; |
35 | 35 | ||
36 | int st_accel_common_probe(struct iio_dev *indio_dev, | 36 | int st_accel_common_probe(struct iio_dev *indio_dev); |
37 | struct st_sensors_platform_data *pdata); | ||
38 | void st_accel_common_remove(struct iio_dev *indio_dev); | 37 | void st_accel_common_remove(struct iio_dev *indio_dev); |
39 | 38 | ||
40 | #ifdef CONFIG_IIO_BUFFER | 39 | #ifdef CONFIG_IIO_BUFFER |
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c index 7cbdfae03441..53f32629283a 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 = { | |||
457 | #define ST_ACCEL_TRIGGER_OPS NULL | 457 | #define ST_ACCEL_TRIGGER_OPS NULL |
458 | #endif | 458 | #endif |
459 | 459 | ||
460 | int st_accel_common_probe(struct iio_dev *indio_dev, | 460 | int st_accel_common_probe(struct iio_dev *indio_dev) |
461 | struct st_sensors_platform_data *plat_data) | ||
462 | { | 461 | { |
463 | struct st_sensor_data *adata = iio_priv(indio_dev); | 462 | struct st_sensor_data *adata = iio_priv(indio_dev); |
464 | int irq = adata->get_irq_data_ready(indio_dev); | 463 | int irq = adata->get_irq_data_ready(indio_dev); |
@@ -484,11 +483,11 @@ int st_accel_common_probe(struct iio_dev *indio_dev, | |||
484 | &adata->sensor_settings->fs.fs_avl[0]; | 483 | &adata->sensor_settings->fs.fs_avl[0]; |
485 | adata->odr = adata->sensor_settings->odr.odr_avl[0].hz; | 484 | adata->odr = adata->sensor_settings->odr.odr_avl[0].hz; |
486 | 485 | ||
487 | if (!plat_data) | 486 | if (!adata->dev->platform_data) |
488 | plat_data = | 487 | adata->dev->platform_data = |
489 | (struct st_sensors_platform_data *)&default_accel_pdata; | 488 | (struct st_sensors_platform_data *)&default_accel_pdata; |
490 | 489 | ||
491 | err = st_sensors_init_sensor(indio_dev, plat_data); | 490 | err = st_sensors_init_sensor(indio_dev, adata->dev->platform_data); |
492 | if (err < 0) | 491 | if (err < 0) |
493 | return err; | 492 | return err; |
494 | 493 | ||
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c index 7164aeff3ab1..40adc7e88a39 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, | |||
84 | 84 | ||
85 | st_sensors_i2c_configure(indio_dev, client, adata); | 85 | st_sensors_i2c_configure(indio_dev, client, adata); |
86 | 86 | ||
87 | err = st_accel_common_probe(indio_dev, client->dev.platform_data); | 87 | err = st_accel_common_probe(indio_dev); |
88 | if (err < 0) | 88 | if (err < 0) |
89 | return err; | 89 | return err; |
90 | 90 | ||
diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c index 195639646e34..2090d80062d2 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) | |||
33 | 33 | ||
34 | st_sensors_spi_configure(indio_dev, spi, adata); | 34 | st_sensors_spi_configure(indio_dev, spi, adata); |
35 | 35 | ||
36 | err = st_accel_common_probe(indio_dev, spi->dev.platform_data); | 36 | err = st_accel_common_probe(indio_dev); |
37 | if (err < 0) | 37 | if (err < 0) |
38 | return err; | 38 | return err; |
39 | 39 | ||