OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mg_disk: Use struct dev_pm_ops for power management 

Make the mg_disk driver define its PM callbacks through
a struct dev_pm_ops object rather than by using legacy PM hooks
in struct platform_driver.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2012-07-05 22:11:33 +02:00
parent 9033132ddf
commit 156ffcb42a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/block/mg_disk.c
View File

@ -780,9 +780,9 @@ static const struct block_device_operations mg_disk_ops = {
.getgeo = mg_getgeo .getgeo = mg_getgeo
}; };
static int mg_suspend(struct platform_device *plat_dev, pm_message_t state) static int mg_suspend(struct device *dev)
{ {
struct mg_drv_data *prv_data = plat_dev->dev.platform_data; struct mg_drv_data *prv_data = dev->platform_data;
struct mg_host *host = prv_data->host; struct mg_host *host = prv_data->host;
if (mg_wait(host, MG_STAT_READY, MG_TMAX_CONF_TO_CMD)) if (mg_wait(host, MG_STAT_READY, MG_TMAX_CONF_TO_CMD))
@ -804,9 +804,9 @@ static int mg_suspend(struct platform_device *plat_dev, pm_message_t state)
return 0; return 0;
} }
static int mg_resume(struct platform_device *plat_dev) static int mg_resume(struct device *dev)
{ {
struct mg_drv_data *prv_data = plat_dev->dev.platform_data; struct mg_drv_data *prv_data = dev->platform_data;
struct mg_host *host = prv_data->host; struct mg_host *host = prv_data->host;
if (mg_wait(host, MG_STAT_READY, MG_TMAX_CONF_TO_CMD)) if (mg_wait(host, MG_STAT_READY, MG_TMAX_CONF_TO_CMD))
@ -825,6 +825,8 @@ static int mg_resume(struct platform_device *plat_dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(mg_pm, mg_suspend, mg_resume);
static int mg_probe(struct platform_device *plat_dev) static int mg_probe(struct platform_device *plat_dev)
{ {
struct mg_host *host; struct mg_host *host;
@ -1074,11 +1076,10 @@ static int mg_remove(struct platform_device *plat_dev)
static struct platform_driver mg_disk_driver = { static struct platform_driver mg_disk_driver = {
.probe = mg_probe, .probe = mg_probe,
.remove = mg_remove, .remove = mg_remove,
.suspend = mg_suspend,
.resume = mg_resume,
.driver = { .driver = {
.name = MG_DEV_NAME, .name = MG_DEV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &mg_pm,
} }
}; };