On Tue, 23 Apr 2019 15:50:03 +0800
Kefeng Wang <wangkefeng.wang@xxxxxxxxxx> wrote:
> Using dev_get_drvdata directly.
>
> Cc: Ludovic Desroches <ludovic.desroches@xxxxxxxxxxxxx>
> Cc: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> Cc: linux-iio@xxxxxxxxxxxxxxx
> Signed-off-by: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx>
A sensible cleanup, thanks.
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/iio/adc/at91-sama5d2_adc.c | 12 ++++--------
> drivers/iio/adc/at91_adc.c | 4 ++--
> 2 files changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c
> index d5ea84cf6460..a3a4ca946308 100644
> --- a/drivers/iio/adc/at91-sama5d2_adc.c
> +++ b/drivers/iio/adc/at91-sama5d2_adc.c
> @@ -1586,8 +1586,7 @@ static void at91_adc_hw_init(struct at91_adc_state *st)
> static ssize_t at91_adc_get_fifo_state(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> - struct iio_dev *indio_dev =
> - platform_get_drvdata(to_platform_device(dev));
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct at91_adc_state *st = iio_priv(indio_dev);
>
> return scnprintf(buf, PAGE_SIZE, "%d\n", !!st->dma_st.dma_chan);
> @@ -1596,8 +1595,7 @@ static ssize_t at91_adc_get_fifo_state(struct device *dev,
> static ssize_t at91_adc_get_watermark(struct device *dev,
> struct device_attribute *attr, char *buf)
> {
> - struct iio_dev *indio_dev =
> - platform_get_drvdata(to_platform_device(dev));
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct at91_adc_state *st = iio_priv(indio_dev);
>
> return scnprintf(buf, PAGE_SIZE, "%d\n", st->dma_st.watermark);
> @@ -1849,8 +1847,7 @@ static int at91_adc_remove(struct platform_device *pdev)
>
> static __maybe_unused int at91_adc_suspend(struct device *dev)
> {
> - struct iio_dev *indio_dev =
> - platform_get_drvdata(to_platform_device(dev));
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct at91_adc_state *st = iio_priv(indio_dev);
>
> /*
> @@ -1870,8 +1867,7 @@ static __maybe_unused int at91_adc_suspend(struct device *dev)
>
> static __maybe_unused int at91_adc_resume(struct device *dev)
> {
> - struct iio_dev *indio_dev =
> - platform_get_drvdata(to_platform_device(dev));
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct at91_adc_state *st = iio_priv(indio_dev);
> int ret;
>
> diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
> index 596841a3c4db..1aa8af3491fd 100644
> --- a/drivers/iio/adc/at91_adc.c
> +++ b/drivers/iio/adc/at91_adc.c
> @@ -1360,7 +1360,7 @@ static int at91_adc_remove(struct platform_device *pdev)
> #ifdef CONFIG_PM_SLEEP
> static int at91_adc_suspend(struct device *dev)
> {
> - struct iio_dev *idev = platform_get_drvdata(to_platform_device(dev));
> + struct iio_dev *idev = dev_get_drvdata(dev);
> struct at91_adc_state *st = iio_priv(idev);
>
> pinctrl_pm_select_sleep_state(dev);
> @@ -1371,7 +1371,7 @@ static int at91_adc_suspend(struct device *dev)
>
> static int at91_adc_resume(struct device *dev)
> {
> - struct iio_dev *idev = platform_get_drvdata(to_platform_device(dev));
> + struct iio_dev *idev = dev_get_drvdata(dev);
> struct at91_adc_state *st = iio_priv(idev);
>
> clk_prepare_enable(st->clk);
