diff options
author | Denis CIOCCA <denis.ciocca@st.com> | 2014-10-03 11:35:38 -0400 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2014-10-04 06:25:19 -0400 |
commit | 2109eb4c0c7d21669ae2ad0cda90c438b5470bf3 (patch) | |
tree | e61e6d3acce3a4eb0d2930911a12a85555fe4b46 | |
parent | ef67b341477e54178245dcd7b349a209ec78d29d (diff) |
iio:magnetometer: 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/magnetometer/st_magn.h | 3 | ||||
-rw-r--r-- | drivers/iio/magnetometer/st_magn_core.c | 5 | ||||
-rw-r--r-- | drivers/iio/magnetometer/st_magn_i2c.c | 2 | ||||
-rw-r--r-- | 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 694e33e0fb72..7e81d00ef0c3 100644 --- a/drivers/iio/magnetometer/st_magn.h +++ b/drivers/iio/magnetometer/st_magn.h | |||
@@ -18,8 +18,7 @@ | |||
18 | #define LSM303DLM_MAGN_DEV_NAME "lsm303dlm_magn" | 18 | #define LSM303DLM_MAGN_DEV_NAME "lsm303dlm_magn" |
19 | #define LIS3MDL_MAGN_DEV_NAME "lis3mdl" | 19 | #define LIS3MDL_MAGN_DEV_NAME "lis3mdl" |
20 | 20 | ||
21 | int st_magn_common_probe(struct iio_dev *indio_dev, | 21 | int st_magn_common_probe(struct iio_dev *indio_dev); |
22 | struct st_sensors_platform_data *pdata); | ||
23 | void st_magn_common_remove(struct iio_dev *indio_dev); | 22 | void st_magn_common_remove(struct iio_dev *indio_dev); |
24 | 23 | ||
25 | #ifdef CONFIG_IIO_BUFFER | 24 | #ifdef CONFIG_IIO_BUFFER |
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c index b65405fada45..1f3c1b7be78f 100644 --- a/drivers/iio/magnetometer/st_magn_core.c +++ b/drivers/iio/magnetometer/st_magn_core.c | |||
@@ -353,8 +353,7 @@ static const struct iio_info magn_info = { | |||
353 | .write_raw = &st_magn_write_raw, | 353 | .write_raw = &st_magn_write_raw, |
354 | }; | 354 | }; |
355 | 355 | ||
356 | int st_magn_common_probe(struct iio_dev *indio_dev, | 356 | int st_magn_common_probe(struct iio_dev *indio_dev) |
357 | struct st_sensors_platform_data *pdata) | ||
358 | { | 357 | { |
359 | struct st_sensor_data *mdata = iio_priv(indio_dev); | 358 | struct st_sensor_data *mdata = iio_priv(indio_dev); |
360 | int irq = mdata->get_irq_data_ready(indio_dev); | 359 | int irq = mdata->get_irq_data_ready(indio_dev); |
@@ -380,7 +379,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev, | |||
380 | &mdata->sensor_settings->fs.fs_avl[0]; | 379 | &mdata->sensor_settings->fs.fs_avl[0]; |
381 | mdata->odr = mdata->sensor_settings->odr.odr_avl[0].hz; | 380 | mdata->odr = mdata->sensor_settings->odr.odr_avl[0].hz; |
382 | 381 | ||
383 | err = st_sensors_init_sensor(indio_dev, pdata); | 382 | err = st_sensors_init_sensor(indio_dev, NULL); |
384 | if (err < 0) | 383 | if (err < 0) |
385 | return err; | 384 | return err; |
386 | 385 | ||
diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c index 689250058442..f8a682374239 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, | |||
56 | 56 | ||
57 | st_sensors_i2c_configure(indio_dev, client, mdata); | 57 | st_sensors_i2c_configure(indio_dev, client, mdata); |
58 | 58 | ||
59 | err = st_magn_common_probe(indio_dev, NULL); | 59 | err = st_magn_common_probe(indio_dev); |
60 | if (err < 0) | 60 | if (err < 0) |
61 | return err; | 61 | return err; |
62 | 62 | ||
diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c index a6143ea51dfc..f64214237cf6 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) | |||
33 | 33 | ||
34 | st_sensors_spi_configure(indio_dev, spi, mdata); | 34 | st_sensors_spi_configure(indio_dev, spi, mdata); |
35 | 35 | ||
36 | err = st_magn_common_probe(indio_dev, NULL); | 36 | err = st_magn_common_probe(indio_dev); |
37 | if (err < 0) | 37 | if (err < 0) |
38 | return err; | 38 | return err; |
39 | 39 | ||