On 19/10/16 18:07, Lars-Peter Clausen wrote: > Both the platform_device and SPI driver call set_drvdata() at the end of > their probe function. Move this into the common probe() function to reduce > duplicated code. > > Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx> Applied. Thanks Jonathan > --- > drivers/staging/iio/adc/ad7606_core.c | 2 ++ > drivers/staging/iio/adc/ad7606_par.c | 2 -- > drivers/staging/iio/adc/ad7606_spi.c | 2 -- > 3 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c > index 4ce103a..13d8090 100644 > --- a/drivers/staging/iio/adc/ad7606_core.c > +++ b/drivers/staging/iio/adc/ad7606_core.c > @@ -517,6 +517,8 @@ struct iio_dev *ad7606_probe(struct device *dev, int irq, > if (ret) > goto error_unregister_ring; > > + dev_set_drvdata(dev, indio_dev); > + > return indio_dev; > error_unregister_ring: > ad7606_ring_cleanup(indio_dev); > diff --git a/drivers/staging/iio/adc/ad7606_par.c b/drivers/staging/iio/adc/ad7606_par.c > index 0a23cd9..c273993 100644 > --- a/drivers/staging/iio/adc/ad7606_par.c > +++ b/drivers/staging/iio/adc/ad7606_par.c > @@ -77,8 +77,6 @@ static int ad7606_par_probe(struct platform_device *pdev) > if (IS_ERR(indio_dev)) > return PTR_ERR(indio_dev); > > - platform_set_drvdata(pdev, indio_dev); > - > return 0; > } > > diff --git a/drivers/staging/iio/adc/ad7606_spi.c b/drivers/staging/iio/adc/ad7606_spi.c > index f69db59..9abbc15 100644 > --- a/drivers/staging/iio/adc/ad7606_spi.c > +++ b/drivers/staging/iio/adc/ad7606_spi.c > @@ -52,8 +52,6 @@ static int ad7606_spi_probe(struct spi_device *spi) > if (IS_ERR(indio_dev)) > return PTR_ERR(indio_dev); > > - spi_set_drvdata(spi, indio_dev); > - > return 0; > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
