hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: iio: ade7758_core: Use devm_iio_device_alloc 

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 fde93556b0
commit d006040204
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/iio/meter/ade7758_core.c
View File

@ -849,12 +849,11 @@ static int ade7758_probe(struct spi_device *spi)
{ {
int ret; int ret;
struct ade7758_state *st; struct ade7758_state *st;
struct iio_dev *indio_dev = iio_device_alloc(sizeof(*st)); struct iio_dev *indio_dev;
if (indio_dev == NULL) { indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
ret = -ENOMEM; if (!indio_dev)
goto error_ret; return -ENOMEM;
}
st = iio_priv(indio_dev); st = iio_priv(indio_dev);
/* this is only used for removal purposes */ /* this is only used for removal purposes */
@ -862,10 +861,8 @@ static int ade7758_probe(struct spi_device *spi)
/* Allocate the comms buffers */ /* Allocate the comms buffers */
st->rx = kcalloc(ADE7758_MAX_RX, sizeof(*st->rx), GFP_KERNEL); st->rx = kcalloc(ADE7758_MAX_RX, sizeof(*st->rx), GFP_KERNEL);
if (st->rx == NULL) { if (!st->rx)
ret = -ENOMEM; return -ENOMEM;
goto error_free_dev;
}
st->tx = kcalloc(ADE7758_MAX_TX, sizeof(*st->tx), GFP_KERNEL); st->tx = kcalloc(ADE7758_MAX_TX, sizeof(*st->tx), GFP_KERNEL);
if (st->tx == NULL) { if (st->tx == NULL) {
ret = -ENOMEM; ret = -ENOMEM;
@ -920,9 +917,6 @@ error_free_tx:
kfree(st->tx); kfree(st->tx);
error_free_rx: error_free_rx:
kfree(st->rx); kfree(st->rx);
error_free_dev:
iio_device_free(indio_dev);
error_ret:
return ret; return ret;
} }
@ -939,8 +933,6 @@ static int ade7758_remove(struct spi_device *spi)
kfree(st->tx); kfree(st->tx);
kfree(st->rx); kfree(st->rx);
iio_device_free(indio_dev);
return 0; return 0;
} }