openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2c-puv3: Use struct dev_pm_ops for power management 

Make the PKUnity-v3 SoC I2C controller driver define its suspend
callback through a struct dev_pm_ops object rather than by using
a legacy PM hook in struct platform_driver.  The empty resume
callback is not necessary, so remove it.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:
Rafael J. Wysocki 2012-07-11 21:25:55 +02:00 committed by Wolfram Sang
parent 783414ba9a
commit b9f1b45bac
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/i2c/busses/i2c-puv3.c
View File

@ -254,7 +254,7 @@ static int __devexit puv3_i2c_remove(struct platform_device *pdev)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int puv3_i2c_suspend(struct platform_device *dev, pm_message_t state) static int puv3_i2c_suspend(struct device *dev)
{ {
int poll_count; int poll_count;
/* Disable the IIC */ /* Disable the IIC */
@ -267,23 +267,20 @@ static int puv3_i2c_suspend(struct platform_device *dev, pm_message_t state)
return 0; return 0;
} }
static int puv3_i2c_resume(struct platform_device *dev) static SIMPLE_DEV_PM_OPS(puv3_i2c_pm, puv3_i2c_suspend, NULL);
{ #define PUV3_I2C_PM (&puv3_i2c_pm)
return 0 ;
}
#else #else
#define puv3_i2c_suspend NULL #define PUV3_I2C_PM NULL
#define puv3_i2c_resume NULL
#endif #endif
static struct platform_driver puv3_i2c_driver = { static struct platform_driver puv3_i2c_driver = {
.probe = puv3_i2c_probe, .probe = puv3_i2c_probe,
.remove = __devexit_p(puv3_i2c_remove), .remove = __devexit_p(puv3_i2c_remove),
.suspend = puv3_i2c_suspend,
.resume = puv3_i2c_resume,
.driver = { .driver = {
.name = "PKUnity-v3-I2C", .name = "PKUnity-v3-I2C",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = PUV3_I2C_PM,
} }
}; };