Skip to content

Commit

Permalink
mg_disk: Use struct dev_pm_ops for power management
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Jul 6, 2012
1 parent 9033132 commit 156ffcb
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/block/mg_disk.c
Original file line number Diff line number Diff line change
Expand Up @@ -780,9 +780,9 @@ static const struct block_device_operations mg_disk_ops = {
.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;

if (mg_wait(host, MG_STAT_READY, MG_TMAX_CONF_TO_CMD))
Expand All @@ -804,9 +804,9 @@ static int mg_suspend(struct platform_device *plat_dev, pm_message_t state)
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;

if (mg_wait(host, MG_STAT_READY, MG_TMAX_CONF_TO_CMD))
Expand All @@ -825,6 +825,8 @@ static int mg_resume(struct platform_device *plat_dev)
return 0;
}

static SIMPLE_DEV_PM_OPS(mg_pm, mg_suspend, mg_resume);

static int mg_probe(struct platform_device *plat_dev)
{
struct mg_host *host;
Expand Down Expand Up @@ -1074,11 +1076,10 @@ static int mg_remove(struct platform_device *plat_dev)
static struct platform_driver mg_disk_driver = {
.probe = mg_probe,
.remove = mg_remove,
.suspend = mg_suspend,
.resume = mg_resume,
.driver = {
.name = MG_DEV_NAME,
.owner = THIS_MODULE,
.pm = &mg_pm,
}
};

Expand Down

0 comments on commit 156ffcb

Please sign in to comment.