Commit 156ffcb42a3b3fbebbb7f0e08e679b0954c0829c
1 parent
9033132ddf
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
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>
Showing 1 changed file with 7 additions and 6 deletions Side-by-side Diff
drivers/block/mg_disk.c
| ... | ... | @@ -780,9 +780,9 @@ |
| 780 | 780 | .getgeo = mg_getgeo |
| 781 | 781 | }; |
| 782 | 782 | |
| 783 | -static int mg_suspend(struct platform_device *plat_dev, pm_message_t state) | |
| 783 | +static int mg_suspend(struct device *dev) | |
| 784 | 784 | { |
| 785 | - struct mg_drv_data *prv_data = plat_dev->dev.platform_data; | |
| 785 | + struct mg_drv_data *prv_data = dev->platform_data; | |
| 786 | 786 | struct mg_host *host = prv_data->host; |
| 787 | 787 | |
| 788 | 788 | if (mg_wait(host, MG_STAT_READY, MG_TMAX_CONF_TO_CMD)) |
| 789 | 789 | |
| ... | ... | @@ -804,9 +804,9 @@ |
| 804 | 804 | return 0; |
| 805 | 805 | } |
| 806 | 806 | |
| 807 | -static int mg_resume(struct platform_device *plat_dev) | |
| 807 | +static int mg_resume(struct device *dev) | |
| 808 | 808 | { |
| 809 | - struct mg_drv_data *prv_data = plat_dev->dev.platform_data; | |
| 809 | + struct mg_drv_data *prv_data = dev->platform_data; | |
| 810 | 810 | struct mg_host *host = prv_data->host; |
| 811 | 811 | |
| 812 | 812 | if (mg_wait(host, MG_STAT_READY, MG_TMAX_CONF_TO_CMD)) |
| ... | ... | @@ -825,6 +825,8 @@ |
| 825 | 825 | return 0; |
| 826 | 826 | } |
| 827 | 827 | |
| 828 | +static SIMPLE_DEV_PM_OPS(mg_pm, mg_suspend, mg_resume); | |
| 829 | + | |
| 828 | 830 | static int mg_probe(struct platform_device *plat_dev) |
| 829 | 831 | { |
| 830 | 832 | struct mg_host *host; |
| 831 | 833 | |
| ... | ... | @@ -1074,11 +1076,10 @@ |
| 1074 | 1076 | static struct platform_driver mg_disk_driver = { |
| 1075 | 1077 | .probe = mg_probe, |
| 1076 | 1078 | .remove = mg_remove, |
| 1077 | - .suspend = mg_suspend, | |
| 1078 | - .resume = mg_resume, | |
| 1079 | 1079 | .driver = { |
| 1080 | 1080 | .name = MG_DEV_NAME, |
| 1081 | 1081 | .owner = THIS_MODULE, |
| 1082 | + .pm = &mg_pm, | |
| 1082 | 1083 | } |
| 1083 | 1084 | }; |
| 1084 | 1085 |