iio: adc: lp8788_adc: convert probe to full-device managed

This change converts the probe of this driver to use device-managed
functions only, which means that the remove hook can be removed.
The remove hook has only 2 calls to iio_device_unregister() and
iio_map_array_unregister(). Both these can now be done via devm register
functions, now that there's also a devm_iio_map_array_register() function.

The platform_set_drvdata() can also be removed now.

This change also removes the error print for when the iio_device_register()
call fails. This isn't required now.

Signed-off-by: Alexandru Ardelean <aardelean@deviqon.com>
Link: https://lore.kernel.org/r/20210903072917.45769-5-aardelean@deviqon.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/adc/lp8788_adc.c b/drivers/iio/adc/lp8788_adc.c
index 8fb57e375529e3f1d62d7ddf9a4b5cf2b3704cda..6d9b354bc705bb712dbed6c1ae588e50c76d522a 100644 (file)
--- a/drivers/iio/adc/lp8788_adc.c
+++ b/drivers/iio/adc/lp8788_adc.c
@@ -163,7 +163,8 @@ static struct iio_map lp8788_default_iio_maps[] = {
        { }
 };
 
-static int lp8788_iio_map_register(struct iio_dev *indio_dev,
+static int lp8788_iio_map_register(struct device *dev,
+                               struct iio_dev *indio_dev,
                                struct lp8788_platform_data *pdata,
                                struct lp8788_adc *adc)
 {
@@ -173,7 +174,7 @@ static int lp8788_iio_map_register(struct iio_dev *indio_dev,
        map = (!pdata || !pdata->adc_pdata) ?
                lp8788_default_iio_maps : pdata->adc_pdata;
 
-       ret = iio_map_array_register(indio_dev, map);
+       ret = devm_iio_map_array_register(dev, indio_dev, map);
        if (ret) {
                dev_err(&indio_dev->dev, "iio map err: %d\n", ret);
                return ret;
@@ -196,9 +197,8 @@ static int lp8788_adc_probe(struct platform_device *pdev)
 
        adc = iio_priv(indio_dev);
        adc->lp = lp;
-       platform_set_drvdata(pdev, indio_dev);
 
-       ret = lp8788_iio_map_register(indio_dev, lp->pdata, adc);
+       ret = lp8788_iio_map_register(&pdev->dev, indio_dev, lp->pdata, adc);
        if (ret)
                return ret;
 
@@ -210,32 +210,11 @@ static int lp8788_adc_probe(struct platform_device *pdev)
        indio_dev->channels = lp8788_adc_channels;
        indio_dev->num_channels = ARRAY_SIZE(lp8788_adc_channels);
 
-       ret = iio_device_register(indio_dev);
-       if (ret) {
-               dev_err(&pdev->dev, "iio dev register err: %d\n", ret);
-               goto err_iio_device;
-       }
-
-       return 0;
-
-err_iio_device:
-       iio_map_array_unregister(indio_dev);
-       return ret;
-}
-
-static int lp8788_adc_remove(struct platform_device *pdev)
-{
-       struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-
-       iio_device_unregister(indio_dev);
-       iio_map_array_unregister(indio_dev);
-
-       return 0;
+       return devm_iio_device_register(&pdev->dev, indio_dev);
 }
 
 static struct platform_driver lp8788_adc_driver = {
        .probe = lp8788_adc_probe,
-       .remove = lp8788_adc_remove,
        .driver = {
                .name = LP8788_DEV_ADC,
        },