forked from luck/tmp_suning_uos_patched
Input: ad7877 - convert to dev_pm_ops
There is a move to deprecate bus-specific PM operations and move to using dev_pm_ops instead in order to reduce the amount of boilerplate code in buses and facilitate updates to the PM core. Do this move for the ad7879 SPI driver. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Michael Hennerich <Michael.Hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
50a88cb7ed
commit
fccdd7c4ae
|
@ -41,6 +41,7 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/input.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/pm.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/spi/ad7877.h>
|
||||
|
@ -826,39 +827,37 @@ static int __devexit ad7877_remove(struct spi_device *spi)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int ad7877_suspend(struct spi_device *spi, pm_message_t message)
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
static int ad7877_suspend(struct device *dev)
|
||||
{
|
||||
struct ad7877 *ts = dev_get_drvdata(&spi->dev);
|
||||
struct ad7877 *ts = dev_get_drvdata(dev);
|
||||
|
||||
ad7877_disable(ts);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ad7877_resume(struct spi_device *spi)
|
||||
static int ad7877_resume(struct device *dev)
|
||||
{
|
||||
struct ad7877 *ts = dev_get_drvdata(&spi->dev);
|
||||
struct ad7877 *ts = dev_get_drvdata(dev);
|
||||
|
||||
ad7877_enable(ts);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
#define ad7877_suspend NULL
|
||||
#define ad7877_resume NULL
|
||||
#endif
|
||||
|
||||
static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume);
|
||||
|
||||
static struct spi_driver ad7877_driver = {
|
||||
.driver = {
|
||||
.name = "ad7877",
|
||||
.bus = &spi_bus_type,
|
||||
.owner = THIS_MODULE,
|
||||
.pm = &ad7877_pm,
|
||||
},
|
||||
.probe = ad7877_probe,
|
||||
.remove = __devexit_p(ad7877_remove),
|
||||
.suspend = ad7877_suspend,
|
||||
.resume = ad7877_resume,
|
||||
};
|
||||
|
||||
static int __init ad7877_init(void)
|
||||
|
|
Loading…
Reference in New Issue
Block a user