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

Commit 7fc5ad7e authored by Sachin Kamat's avatar Sachin Kamat Committed by Jonathan Cameron
Browse files

iio: magnetometer: st_magn: Use devm_iio_device_alloc 



Using devm_iio_device_alloc makes code simpler.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Cc: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 907c0a0a

drivers/iio/magnetometer/st_magn_core.c

+0 −1
Original line number Diff line number Diff line
@@ -407,7 +407,6 @@ void st_magn_common_remove(struct iio_dev *indio_dev) 
		st_sensors_deallocate_trigger(indio_dev);

		st_magn_deallocate_ring(indio_dev);

	}

	iio_device_free(indio_dev);

}

EXPORT_SYMBOL(st_magn_common_remove);

drivers/iio/magnetometer/st_magn_i2c.c

+4 −11
Original line number Diff line number Diff line
@@ -25,11 +25,9 @@ static int st_magn_i2c_probe(struct i2c_client *client, 
	struct st_sensor_data *mdata;

	int err;



	indio_dev = iio_device_alloc(sizeof(*mdata));

	if (indio_dev == NULL) {

		err = -ENOMEM;

		goto iio_device_alloc_error;

	}

	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*mdata));

	if (!indio_dev)

		return -ENOMEM;



	mdata = iio_priv(indio_dev);

	mdata->dev = &client->dev;
@@ -38,14 +36,9 @@ static int st_magn_i2c_probe(struct i2c_client *client, 


	err = st_magn_common_probe(indio_dev, NULL);

	if (err < 0)

		goto st_magn_common_probe_error;

		return err;



	return 0;



st_magn_common_probe_error:

	iio_device_free(indio_dev);

iio_device_alloc_error:

	return err;

}



static int st_magn_i2c_remove(struct i2c_client *client)

drivers/iio/magnetometer/st_magn_spi.c

+4 −11
Original line number Diff line number Diff line
@@ -24,11 +24,9 @@ static int st_magn_spi_probe(struct spi_device *spi) 
	struct st_sensor_data *mdata;

	int err;



	indio_dev = iio_device_alloc(sizeof(*mdata));

	if (indio_dev == NULL) {

		err = -ENOMEM;

		goto iio_device_alloc_error;

	}

	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*mdata));

	if (!indio_dev)

		return -ENOMEM;



	mdata = iio_priv(indio_dev);

	mdata->dev = &spi->dev;
@@ -37,14 +35,9 @@ static int st_magn_spi_probe(struct spi_device *spi) 


	err = st_magn_common_probe(indio_dev, NULL);

	if (err < 0)

		goto st_magn_common_probe_error;

		return err;



	return 0;



st_magn_common_probe_error:

	iio_device_free(indio_dev);

iio_device_alloc_error:

	return err;

}



static int st_magn_spi_remove(struct spi_device *spi)