2019-07-26 11:12:03

by Chuhong Yuan

Subject: [PATCH] staging: iio: ad2s1210: Use device-managed API

Use device-managed API to simplify the code.
The remove function is redundant now and can
be deleted.

Signed-off-by: Chuhong Yuan <[email protected]>
---
drivers/staging/iio/resolver/ad2s1210.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
index 0c1bd108c386..4b25a3a314ed 100644
--- a/drivers/staging/iio/resolver/ad2s1210.c
+++ b/drivers/staging/iio/resolver/ad2s1210.c
@@ -671,7 +671,7 @@ static int ad2s1210_probe(struct spi_device *spi)
indio_dev->num_channels = ARRAY_SIZE(ad2s1210_channels);
indio_dev->name = spi_get_device_id(spi)->name;

- ret = iio_device_register(indio_dev);
+ ret = devm_iio_device_register(&spi->dev, indio_dev);
if (ret)
return ret;

@@ -683,15 +683,6 @@ static int ad2s1210_probe(struct spi_device *spi)
return 0;
}

-static int ad2s1210_remove(struct spi_device *spi)
-{
- struct iio_dev *indio_dev = spi_get_drvdata(spi);
-
- iio_device_unregister(indio_dev);
-
- return 0;
-}
-
static const struct of_device_id ad2s1210_of_match[] = {
{ .compatible = "adi,ad2s1210", },
{ }
@@ -710,7 +701,6 @@ static struct spi_driver ad2s1210_driver = {
.of_match_table = of_match_ptr(ad2s1210_of_match),
},
.probe = ad2s1210_probe,
- .remove = ad2s1210_remove,
.id_table = ad2s1210_id,
};
module_spi_driver(ad2s1210_driver);
--
2.20.1

2019-07-26 12:38:16

by Alexandru Ardelean

Subject: Re: [PATCH] staging: iio: ad2s1210: Use device-managed API

On Fri, 2019-07-26 at 19:07 +0800, Chuhong Yuan wrote:
> [External]
>
> Use device-managed API to simplify the code.
> The remove function is redundant now and can
> be deleted.

Reviewed-by: Alexandru Ardelean <[email protected]>

>
> Signed-off-by: Chuhong Yuan <[email protected]>
> ---
> drivers/staging/iio/resolver/ad2s1210.c | 12 +-----------
> 1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
> index 0c1bd108c386..4b25a3a314ed 100644
> --- a/drivers/staging/iio/resolver/ad2s1210.c
> +++ b/drivers/staging/iio/resolver/ad2s1210.c
> @@ -671,7 +671,7 @@ static int ad2s1210_probe(struct spi_device *spi)
> indio_dev->num_channels = ARRAY_SIZE(ad2s1210_channels);
> indio_dev->name = spi_get_device_id(spi)->name;
>
> - ret = iio_device_register(indio_dev);
> + ret = devm_iio_device_register(&spi->dev, indio_dev);
> if (ret)
> return ret;
>
> @@ -683,15 +683,6 @@ static int ad2s1210_probe(struct spi_device *spi)
> return 0;
> }
>
> -static int ad2s1210_remove(struct spi_device *spi)
> -{
> - struct iio_dev *indio_dev = spi_get_drvdata(spi);
> -
> - iio_device_unregister(indio_dev);
> -
> - return 0;
> -}
> -
> static const struct of_device_id ad2s1210_of_match[] = {
> { .compatible = "adi,ad2s1210", },
> { }
> @@ -710,7 +701,6 @@ static struct spi_driver ad2s1210_driver = {
> .of_match_table = of_match_ptr(ad2s1210_of_match),
> },
> .probe = ad2s1210_probe,
> - .remove = ad2s1210_remove,
> .id_table = ad2s1210_id,
> };
> module_spi_driver(ad2s1210_driver);

2019-07-27 14:14:28

by Jonathan Cameron

Subject: Re: [PATCH] staging: iio: ad2s1210: Use device-managed API

On Fri, 26 Jul 2019 12:36:08 +0000
"Ardelean, Alexandru" <[email protected]> wrote:

> On Fri, 2019-07-26 at 19:07 +0800, Chuhong Yuan wrote:
> > [External]
> >
> > Use device-managed API to simplify the code.
> > The remove function is redundant now and can
> > be deleted.
>
> Reviewed-by: Alexandru Ardelean <[email protected]>
The end of this probe function is rather odd and probably needs sorting
out as I imagine that needs to happen before the device is exposed to
userspace.

Nothing to do with this patch though which is great.

Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.

Thanks,

Jonathan

>
> >
> > Signed-off-by: Chuhong Yuan <[email protected]>
> > ---
> > drivers/staging/iio/resolver/ad2s1210.c | 12 +-----------
> > 1 file changed, 1 insertion(+), 11 deletions(-)
> >
> > diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
> > index 0c1bd108c386..4b25a3a314ed 100644
> > --- a/drivers/staging/iio/resolver/ad2s1210.c
> > +++ b/drivers/staging/iio/resolver/ad2s1210.c
> > @@ -671,7 +671,7 @@ static int ad2s1210_probe(struct spi_device *spi)
> > indio_dev->num_channels = ARRAY_SIZE(ad2s1210_channels);
> > indio_dev->name = spi_get_device_id(spi)->name;
> >
> > - ret = iio_device_register(indio_dev);
> > + ret = devm_iio_device_register(&spi->dev, indio_dev);
> > if (ret)
> > return ret;
> >
> > @@ -683,15 +683,6 @@ static int ad2s1210_probe(struct spi_device *spi)
> > return 0;
> > }
> >
> > -static int ad2s1210_remove(struct spi_device *spi)
> > -{
> > - struct iio_dev *indio_dev = spi_get_drvdata(spi);
> > -
> > - iio_device_unregister(indio_dev);
> > -
> > - return 0;
> > -}
> > -
> > static const struct of_device_id ad2s1210_of_match[] = {
> > { .compatible = "adi,ad2s1210", },
> > { }
> > @@ -710,7 +701,6 @@ static struct spi_driver ad2s1210_driver = {
> > .of_match_table = of_match_ptr(ad2s1210_of_match),
> > },
> > .probe = ad2s1210_probe,
> > - .remove = ad2s1210_remove,
> > .id_table = ad2s1210_id,
> > };
> > module_spi_driver(ad2s1210_driver);