Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2109eb4c authored by Denis CIOCCA's avatar Denis CIOCCA Committed by Jonathan Cameron
Browse files

iio:magnetometer: Removed unnecessary parameter on common_probe function 



Signed-off-by: default avatarDenis Ciocca <denis.ciocca@st.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent ef67b341

drivers/iio/magnetometer/st_magn.h

+1 −2
Original line number Diff line number Diff line
@@ -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

drivers/iio/magnetometer/st_magn_core.c

+2 −3
Original line number Diff line number Diff line
@@ -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);
@@ -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;

drivers/iio/magnetometer/st_magn_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/iio/magnetometer/st_magn_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;