|
@@ -107,16 +107,16 @@ static int ad2s1200_probe(struct spi_device *spi)
|
|
|
unsigned short *pins = spi->dev.platform_data;
|
|
|
|
|
|
for (pn = 0; pn < AD2S1200_PN; pn++)
|
|
|
- if (gpio_request_one(pins[pn], GPIOF_DIR_OUT, DRV_NAME)) {
|
|
|
+ ret = devm_gpio_request_one(&spi->dev, pins[pn], GPIOF_DIR_OUT,
|
|
|
+ DRV_NAME);
|
|
|
+ if (ret) {
|
|
|
pr_err("%s: request gpio pin %d failed\n",
|
|
|
DRV_NAME, pins[pn]);
|
|
|
- goto error_ret;
|
|
|
+ return ret;
|
|
|
}
|
|
|
- indio_dev = iio_device_alloc(sizeof(*st));
|
|
|
- if (indio_dev == NULL) {
|
|
|
- ret = -ENOMEM;
|
|
|
- goto error_ret;
|
|
|
- }
|
|
|
+ indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
|
|
|
+ if (!indio_dev)
|
|
|
+ return -ENOMEM;
|
|
|
spi_set_drvdata(spi, indio_dev);
|
|
|
st = iio_priv(indio_dev);
|
|
|
mutex_init(&st->lock);
|
|
@@ -133,26 +133,18 @@ static int ad2s1200_probe(struct spi_device *spi)
|
|
|
|
|
|
ret = iio_device_register(indio_dev);
|
|
|
if (ret)
|
|
|
- goto error_free_dev;
|
|
|
+ return ret;
|
|
|
|
|
|
spi->max_speed_hz = AD2S1200_HZ;
|
|
|
spi->mode = SPI_MODE_3;
|
|
|
spi_setup(spi);
|
|
|
|
|
|
return 0;
|
|
|
-
|
|
|
-error_free_dev:
|
|
|
- iio_device_free(indio_dev);
|
|
|
-error_ret:
|
|
|
- for (--pn; pn >= 0; pn--)
|
|
|
- gpio_free(pins[pn]);
|
|
|
- return ret;
|
|
|
}
|
|
|
|
|
|
static int ad2s1200_remove(struct spi_device *spi)
|
|
|
{
|
|
|
iio_device_unregister(spi_get_drvdata(spi));
|
|
|
- iio_device_free(spi_get_drvdata(spi));
|
|
|
|
|
|
return 0;
|
|
|
}
|