Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 156ffcb4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 9033132d

drivers/block/mg_disk.c

+7 −6
Original line number Diff line number Diff line
@@ -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))
@@ -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))
@@ -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;
@@ -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,

	}

};