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