Skip to content

Commit

Permalink
iio:magnetometer: Removed unnecessary parameter on common_probe function
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
  • Loading branch information
Denis CIOCCA authored and Jonathan Cameron committed Oct 4, 2014
1 parent ef67b34 commit 2109eb4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
3 changes: 1 addition & 2 deletions drivers/iio/magnetometer/st_magn.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions drivers/iio/magnetometer/st_magn_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,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);
Expand All @@ -380,7 +379,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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/iio/magnetometer/st_magn_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/iio/magnetometer/st_magn_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 2109eb4

Please sign in to comment.