diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2009-07-21 21:14:16 +0000 |
---|---|---|
committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-07-21 21:14:16 +0000 |
commit | b5a10d0288bc12df71e3ce1a68a4f1025f9f382c (patch) | |
tree | dd19566c9bfc8125c09d097aedb7ec48698aff7d /target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-spi-gpio.c | |
parent | 78fae87beb5ba2c0afd3beb7176f735c00ea5f04 (diff) | |
download | master-187ad058-b5a10d0288bc12df71e3ce1a68a4f1025f9f382c.tar.gz master-187ad058-b5a10d0288bc12df71e3ce1a68a4f1025f9f382c.tar.bz2 master-187ad058-b5a10d0288bc12df71e3ce1a68a4f1025f9f382c.zip |
[s3c24xx] glamo: Use dev_pm_ops instead of platform suspend/resume.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16952 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-spi-gpio.c')
-rw-r--r-- | target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-spi-gpio.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-spi-gpio.c b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-spi-gpio.c index de632c5a55..6316b85d0c 100644 --- a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-spi-gpio.c +++ b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-spi-gpio.c @@ -211,20 +211,16 @@ static int glamo_spigpio_remove(struct platform_device *pdev) return 0; } -/*#define glamo_spigpio_suspend NULL -#define glamo_spigpio_resume NULL -*/ - #ifdef CONFIG_PM -static int glamo_spigpio_suspend(struct platform_device *pdev, pm_message_t state) +/*static int glamo_spigpio_suspend(struct device *dev) { return 0; -} +}*/ -static int glamo_spigpio_resume(struct platform_device *pdev) +static int glamo_spigpio_resume(struct device *dev) { - struct glamo_spigpio *sp = platform_get_drvdata(pdev); + struct glamo_spigpio *sp = dev_get_drvdata(dev); if (!sp) return 0; @@ -242,18 +238,25 @@ static int glamo_spigpio_resume(struct platform_device *pdev) return 0; } + +static struct dev_pm_ops glamo_spigpio_pm_ops = { +/* .suspend = glamo_spiogpio_suspend,*/ + .resume_noirq = glamo_spigpio_resume, +}; + +#define GLAMO_SPIGPIO_PM_OPS (&glamo_spigpio_pm_ops) + +#else +#define GLAMO_SPIGPIO_PM_OPS NULL #endif static struct platform_driver glamo_spi_drv = { .probe = glamo_spigpio_probe, .remove = glamo_spigpio_remove, -#ifdef CONFIG_PM - .suspend_late = glamo_spigpio_suspend, - .resume_early = glamo_spigpio_resume, -#endif .driver = { .name = "glamo-spi-gpio", .owner = THIS_MODULE, + .pm = GLAMO_SPIGPIO_PM_OPS, }, }; |