On 02/11/2011 04:33 PM, Mark Brown wrote:
> There is a general move to convert drivers to use dev_pm_ops rather than
> bus specific ones in order to facilitate core development. Do this
> conversion for adxl34x-spi.
>
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
>
Acked-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
> ---
> drivers/input/misc/adxl34x-spi.c | 16 +++++++++-------
> 1 files changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/input/misc/adxl34x-spi.c b/drivers/input/misc/adxl34x-spi.c
> index 782de9e..5231add 100644
> --- a/drivers/input/misc/adxl34x-spi.c
> +++ b/drivers/input/misc/adxl34x-spi.c
> @@ -10,6 +10,7 @@
> #include <linux/input.h> /* BUS_SPI */
> #include <linux/module.h>
> #include <linux/spi/spi.h>
> +#include <linux/pm.h>
> #include <linux/types.h>
> #include "adxl34x.h"
>
> @@ -94,8 +95,9 @@ static int __devexit adxl34x_spi_remove(struct spi_device *spi)
> }
>
> #ifdef CONFIG_PM
> -static int adxl34x_spi_suspend(struct spi_device *spi, pm_message_t message)
> +static int adxl34x_spi_suspend(struct device *dev)
> {
> + struct spi_device *spi = to_spi_device(dev);
> struct adxl34x *ac = dev_get_drvdata(&spi->dev);
>
> adxl34x_suspend(ac);
> @@ -103,29 +105,29 @@ static int adxl34x_spi_suspend(struct spi_device *spi, pm_message_t message)
> return 0;
> }
>
> -static int adxl34x_spi_resume(struct spi_device *spi)
> +static int adxl34x_spi_resume(struct device *dev)
> {
> + struct spi_device *spi = to_spi_device(dev);
> struct adxl34x *ac = dev_get_drvdata(&spi->dev);
>
> adxl34x_resume(ac);
>
> return 0;
> }
> -#else
> -# define adxl34x_spi_suspend NULL
> -# define adxl34x_spi_resume NULL
> #endif
>
> +static SIMPLE_DEV_PM_OPS(adxl34x_spi_pm, adxl34x_spi_suspend,
> + adxl34x_spi_resume);
> +
> static struct spi_driver adxl34x_driver = {
> .driver = {
> .name = "adxl34x",
> .bus = &spi_bus_type,
> .owner = THIS_MODULE,
> + .pm = &adxl34x_spi_pm,
> },
> .probe = adxl34x_spi_probe,
> .remove = __devexit_p(adxl34x_spi_remove),
> - .suspend = adxl34x_spi_suspend,
> - .resume = adxl34x_spi_resume,
> };
>
> static int __init adxl34x_spi_init(void)
>
--
Greetings,
Michael
--
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
