Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 14:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

iio: magnetometer: st_magn: Use devm_iio_device_alloc

Browse Source 
Using devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Sachin Kamat 2013-08-02 11:08:00 +01:00 committed by Jonathan Cameron
parent 907c0a0ae0
commit 7fc5ad7e97
3 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/iio/magnetometer/st_magn_core.c
View File

@ -407,7 +407,6 @@ void st_magn_common_remove(struct iio_dev *indio_dev)
st_sensors_deallocate_trigger(indio_dev); st_sensors_deallocate_trigger(indio_dev);
st_magn_deallocate_ring(indio_dev); st_magn_deallocate_ring(indio_dev);
} }
iio_device_free(indio_dev);
} }
EXPORT_SYMBOL(st_magn_common_remove); EXPORT_SYMBOL(st_magn_common_remove);

15
drivers/iio/magnetometer/st_magn_i2c.c
View File

@ -25,11 +25,9 @@ static int st_magn_i2c_probe(struct i2c_client *client,
struct st_sensor_data *mdata; struct st_sensor_data *mdata;
int err; int err;
indio_dev = iio_device_alloc(sizeof(*mdata)); indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*mdata));
if (indio_dev == NULL) { if (!indio_dev)
err = -ENOMEM; return -ENOMEM;
goto iio_device_alloc_error;
}
mdata = iio_priv(indio_dev); mdata = iio_priv(indio_dev);
mdata->dev = &client->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); err = st_magn_common_probe(indio_dev, NULL);
if (err < 0) if (err < 0)
goto st_magn_common_probe_error; return err;
return 0; 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) static int st_magn_i2c_remove(struct i2c_client *client)

15
drivers/iio/magnetometer/st_magn_spi.c
View File

@ -24,11 +24,9 @@ static int st_magn_spi_probe(struct spi_device *spi)
struct st_sensor_data *mdata; struct st_sensor_data *mdata;
int err; int err;
indio_dev = iio_device_alloc(sizeof(*mdata)); indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*mdata));
if (indio_dev == NULL) { if (!indio_dev)
err = -ENOMEM; return -ENOMEM;
goto iio_device_alloc_error;
}
mdata = iio_priv(indio_dev); mdata = iio_priv(indio_dev);
mdata->dev = &spi->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); err = st_magn_common_probe(indio_dev, NULL);
if (err < 0) if (err < 0)
goto st_magn_common_probe_error; return err;
return 0; 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) static int st_magn_spi_remove(struct spi_device *spi)