renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 02:04:05 +08:00
Code

staging: iio: ade7854: Use devm_iio_device_alloc

Browse Source 
devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Barry Song <21cnbao@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Sachin Kamat 2013-09-11 10:55:00 +01:00 committed by Jonathan Cameron
parent b67637a3e7
commit b909459f15
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/iio/meter/ade7854-i2c.c
View File

@ -208,7 +208,7 @@ static int ade7854_i2c_probe(struct i2c_client *client,
struct ade7854_state *st; struct ade7854_state *st;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
indio_dev = iio_device_alloc(sizeof(*st)); indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*st));
if (indio_dev == NULL) if (indio_dev == NULL)
return -ENOMEM; return -ENOMEM;
st = iio_priv(indio_dev); st = iio_priv(indio_dev);
@ -225,8 +225,6 @@ static int ade7854_i2c_probe(struct i2c_client *client,
st->irq = client->irq; st->irq = client->irq;
ret = ade7854_probe(indio_dev, &client->dev); ret = ade7854_probe(indio_dev, &client->dev);
if (ret)
iio_device_free(indio_dev);
return ret; return ret;
} }

4
drivers/staging/iio/meter/ade7854-spi.c
View File

@ -278,7 +278,7 @@ static int ade7854_spi_probe(struct spi_device *spi)
struct ade7854_state *st; struct ade7854_state *st;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
indio_dev = iio_device_alloc(sizeof(*st)); indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (indio_dev == NULL) if (indio_dev == NULL)
return -ENOMEM; return -ENOMEM;
st = iio_priv(indio_dev); st = iio_priv(indio_dev);
@ -296,8 +296,6 @@ static int ade7854_spi_probe(struct spi_device *spi)
ret = ade7854_probe(indio_dev, &spi->dev); ret = ade7854_probe(indio_dev, &spi->dev);
if (ret)
iio_device_free(indio_dev);
return 0; return 0;
} }

6
drivers/staging/iio/meter/ade7854.c
View File

@ -550,7 +550,7 @@ int ade7854_probe(struct iio_dev *indio_dev, struct device *dev)
ret = iio_device_register(indio_dev); ret = iio_device_register(indio_dev);
if (ret) if (ret)
goto error_free_dev; return ret;
/* Get the device into a sane initial state */ /* Get the device into a sane initial state */
ret = ade7854_initial_setup(indio_dev); ret = ade7854_initial_setup(indio_dev);
@ -561,9 +561,6 @@ int ade7854_probe(struct iio_dev *indio_dev, struct device *dev)
error_unreg_dev: error_unreg_dev:
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
error_free_dev:
iio_device_free(indio_dev);
return ret; return ret;
} }
EXPORT_SYMBOL(ade7854_probe); EXPORT_SYMBOL(ade7854_probe);
@ -571,7 +568,6 @@ EXPORT_SYMBOL(ade7854_probe);
int ade7854_remove(struct iio_dev *indio_dev) int ade7854_remove(struct iio_dev *indio_dev)
{ {
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
iio_device_free(indio_dev);
return 0; return 0;
} }