Commit 870d26f6 authored by Liam Beguin's avatar Liam Beguin Committed by Jonathan Cameron

iio: adc: ad7949: use devm managed functions

Switch to devm_iio_device_register to finalize devm migration.
This removes the use for iio_device_unregister() and since
mutex_destroy() is not necessary here, remove it altogether.
Signed-off-by: default avatarLiam Beguin <lvb@xiphos.com>
Link: https://lore.kernel.org/r/20210815213309.2847711-6-liambeguin@gmail.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 9a7b7594
...@@ -401,34 +401,16 @@ static int ad7949_spi_probe(struct spi_device *spi) ...@@ -401,34 +401,16 @@ static int ad7949_spi_probe(struct spi_device *spi)
ret = ad7949_spi_init(ad7949_adc); ret = ad7949_spi_init(ad7949_adc);
if (ret) { if (ret) {
dev_err(dev, "enable to init this device: %d\n", ret); dev_err(dev, "enable to init this device: %d\n", ret);
goto err; return ret;
} }
ret = iio_device_register(indio_dev); ret = devm_iio_device_register(dev, indio_dev);
if (ret) { if (ret)
dev_err(dev, "fail to register iio device: %d\n", ret); dev_err(dev, "fail to register iio device: %d\n", ret);
goto err;
}
return 0;
err:
mutex_destroy(&ad7949_adc->lock);
return ret; return ret;
} }
static int ad7949_spi_remove(struct spi_device *spi)
{
struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad7949_adc_chip *ad7949_adc = iio_priv(indio_dev);
iio_device_unregister(indio_dev);
mutex_destroy(&ad7949_adc->lock);
return 0;
}
static const struct of_device_id ad7949_spi_of_id[] = { static const struct of_device_id ad7949_spi_of_id[] = {
{ .compatible = "adi,ad7949" }, { .compatible = "adi,ad7949" },
{ .compatible = "adi,ad7682" }, { .compatible = "adi,ad7682" },
...@@ -451,7 +433,6 @@ static struct spi_driver ad7949_spi_driver = { ...@@ -451,7 +433,6 @@ static struct spi_driver ad7949_spi_driver = {
.of_match_table = ad7949_spi_of_id, .of_match_table = ad7949_spi_of_id,
}, },
.probe = ad7949_spi_probe, .probe = ad7949_spi_probe,
.remove = ad7949_spi_remove,
.id_table = ad7949_spi_id, .id_table = ad7949_spi_id,
}; };
module_spi_driver(ad7949_spi_driver); module_spi_driver(ad7949_spi_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment