On 05/02/16 10:32, Lars-Peter Clausen wrote:
> Both the SPI and platform device driver for the ad7606 use the same set of
> PM ops. Consolidate them in the common part of the driver.
>
> Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx>
Lars, this doesn't apply to the togreg branch.
Looks like you are locally missing the patch:
0046a46a8f93f5b99b499118779521ba3b017d69
staging/ad7606: Actually build the interface modules
Which was fixing some module building issues back in October last year.
Jonathan
> ---
> drivers/staging/iio/adc/ad7606.h | 10 ++++++++--
> drivers/staging/iio/adc/ad7606_core.c | 16 ++++++++++++++--
> drivers/staging/iio/adc/ad7606_par.c | 32 +-------------------------------
> drivers/staging/iio/adc/ad7606_spi.c | 32 +-------------------------------
> 4 files changed, 24 insertions(+), 66 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/ad7606.h b/drivers/staging/iio/adc/ad7606.h
> index ec89d05..cca9469 100644
> --- a/drivers/staging/iio/adc/ad7606.h
> +++ b/drivers/staging/iio/adc/ad7606.h
> @@ -85,8 +85,6 @@ struct ad7606_bus_ops {
> int (*read_block)(struct device *, int, void *);
> };
>
> -void ad7606_suspend(struct iio_dev *indio_dev);
> -void ad7606_resume(struct iio_dev *indio_dev);
> struct iio_dev *ad7606_probe(struct device *dev, int irq,
> void __iomem *base_address, unsigned id,
> const struct ad7606_bus_ops *bops);
> @@ -101,4 +99,12 @@ enum ad7606_supported_device_ids {
>
> int ad7606_register_ring_funcs_and_init(struct iio_dev *indio_dev);
> void ad7606_ring_cleanup(struct iio_dev *indio_dev);
> +
> +#ifdef CONFIG_PM_SLEEP
> +extern const struct dev_pm_ops ad7606_pm_ops;
> +#define AD7606_PM_OPS (&ad7606_pm_ops)
> +#else
> +#define AD7606_PM_OPS NULL
> +#endif
> +
> #endif /* IIO_ADC_AD7606_H_ */
> diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c
> index 5796ed2..d0b634d 100644
> --- a/drivers/staging/iio/adc/ad7606_core.c
> +++ b/drivers/staging/iio/adc/ad7606_core.c
> @@ -576,8 +576,11 @@ int ad7606_remove(struct iio_dev *indio_dev, int irq)
> return 0;
> }
>
> -void ad7606_suspend(struct iio_dev *indio_dev)
> +#ifdef CONFIG_PM_SLEEP
> +
> +static int ad7606_suspend(struct device *dev)
> {
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct ad7606_state *st = iio_priv(indio_dev);
>
> if (gpio_is_valid(st->pdata->gpio_stby)) {
> @@ -585,10 +588,13 @@ void ad7606_suspend(struct iio_dev *indio_dev)
> gpio_set_value(st->pdata->gpio_range, 1);
> gpio_set_value(st->pdata->gpio_stby, 0);
> }
> +
> + return 0;
> }
>
> -void ad7606_resume(struct iio_dev *indio_dev)
> +static int ad7606_resume(struct device *dev)
> {
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct ad7606_state *st = iio_priv(indio_dev);
>
> if (gpio_is_valid(st->pdata->gpio_stby)) {
> @@ -599,8 +605,14 @@ void ad7606_resume(struct iio_dev *indio_dev)
> gpio_set_value(st->pdata->gpio_stby, 1);
> ad7606_reset(st);
> }
> +
> + return 0;
> }
>
> +SIMPLE_DEV_PM_OPS(ad7606_pm_ops, ad7606_suspend, ad7606_resume);
> +
> +#endif
> +
> MODULE_AUTHOR("Michael Hennerich <hennerich@xxxxxxxxxxxxxxxxxxxx>");
> MODULE_DESCRIPTION("Analog Devices AD7606 ADC");
> MODULE_LICENSE("GPL v2");
> diff --git a/drivers/staging/iio/adc/ad7606_par.c b/drivers/staging/iio/adc/ad7606_par.c
> index adc370e..84d2393 100644
> --- a/drivers/staging/iio/adc/ad7606_par.c
> +++ b/drivers/staging/iio/adc/ad7606_par.c
> @@ -90,36 +90,6 @@ static int ad7606_par_remove(struct platform_device *pdev)
> return 0;
> }
>
> -#ifdef CONFIG_PM
> -static int ad7606_par_suspend(struct device *dev)
> -{
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> -
> - ad7606_suspend(indio_dev);
> -
> - return 0;
> -}
> -
> -static int ad7606_par_resume(struct device *dev)
> -{
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> -
> - ad7606_resume(indio_dev);
> -
> - return 0;
> -}
> -
> -static const struct dev_pm_ops ad7606_pm_ops = {
> - .suspend = ad7606_par_suspend,
> - .resume = ad7606_par_resume,
> -};
> -
> -#define AD7606_PAR_PM_OPS (&ad7606_pm_ops)
> -
> -#else
> -#define AD7606_PAR_PM_OPS NULL
> -#endif /* CONFIG_PM */
> -
> static const struct platform_device_id ad7606_driver_ids[] = {
> {
> .name = "ad7606-8",
> @@ -142,7 +112,7 @@ static struct platform_driver ad7606_driver = {
> .id_table = ad7606_driver_ids,
> .driver = {
> .name = "ad7606",
> - .pm = AD7606_PAR_PM_OPS,
> + .pm = AD7606_PM_OPS,
> },
> };
>
> diff --git a/drivers/staging/iio/adc/ad7606_spi.c b/drivers/staging/iio/adc/ad7606_spi.c
> index cbb3631..d873a51 100644
> --- a/drivers/staging/iio/adc/ad7606_spi.c
> +++ b/drivers/staging/iio/adc/ad7606_spi.c
> @@ -62,36 +62,6 @@ static int ad7606_spi_remove(struct spi_device *spi)
> return ad7606_remove(indio_dev, spi->irq);
> }
>
> -#ifdef CONFIG_PM
> -static int ad7606_spi_suspend(struct device *dev)
> -{
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> -
> - ad7606_suspend(indio_dev);
> -
> - return 0;
> -}
> -
> -static int ad7606_spi_resume(struct device *dev)
> -{
> - struct iio_dev *indio_dev = dev_get_drvdata(dev);
> -
> - ad7606_resume(indio_dev);
> -
> - return 0;
> -}
> -
> -static const struct dev_pm_ops ad7606_pm_ops = {
> - .suspend = ad7606_spi_suspend,
> - .resume = ad7606_spi_resume,
> -};
> -
> -#define AD7606_SPI_PM_OPS (&ad7606_pm_ops)
> -
> -#else
> -#define AD7606_SPI_PM_OPS NULL
> -#endif
> -
> static const struct spi_device_id ad7606_id[] = {
> {"ad7606-8", ID_AD7606_8},
> {"ad7606-6", ID_AD7606_6},
> @@ -103,7 +73,7 @@ MODULE_DEVICE_TABLE(spi, ad7606_id);
> static struct spi_driver ad7606_driver = {
> .driver = {
> .name = "ad7606",
> - .pm = AD7606_SPI_PM_OPS,
> + .pm = AD7606_PM_OPS,
> },
> .probe = ad7606_spi_probe,
> .remove = ad7606_spi_remove,
>
--
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
