Commit d3e94f3f authored by Brian Norris's avatar Brian Norris

mtd: pxa3xx_nand: switch to device PM

The old PM model is deprecated. This is equivalent.
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Tested-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
Acked-by: default avatarEzequiel Garcia <ezequiel@vanguardiasur.com.ar>
parent 2e17497c
...@@ -1890,21 +1890,21 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) ...@@ -1890,21 +1890,21 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int pxa3xx_nand_suspend(struct platform_device *pdev, pm_message_t state) static int pxa3xx_nand_suspend(struct device *dev)
{ {
struct pxa3xx_nand_info *info = platform_get_drvdata(pdev); struct pxa3xx_nand_info *info = dev_get_drvdata(dev);
if (info->state) { if (info->state) {
dev_err(&pdev->dev, "driver busy, state = %d\n", info->state); dev_err(dev, "driver busy, state = %d\n", info->state);
return -EAGAIN; return -EAGAIN;
} }
return 0; return 0;
} }
static int pxa3xx_nand_resume(struct platform_device *pdev) static int pxa3xx_nand_resume(struct device *dev)
{ {
struct pxa3xx_nand_info *info = platform_get_drvdata(pdev); struct pxa3xx_nand_info *info = dev_get_drvdata(dev);
/* We don't want to handle interrupt without calling mtd routine */ /* We don't want to handle interrupt without calling mtd routine */
disable_int(info, NDCR_INT_MASK); disable_int(info, NDCR_INT_MASK);
...@@ -1931,15 +1931,19 @@ static int pxa3xx_nand_resume(struct platform_device *pdev) ...@@ -1931,15 +1931,19 @@ static int pxa3xx_nand_resume(struct platform_device *pdev)
#define pxa3xx_nand_resume NULL #define pxa3xx_nand_resume NULL
#endif #endif
static const struct dev_pm_ops pxa3xx_nand_pm_ops = {
.suspend = pxa3xx_nand_suspend,
.resume = pxa3xx_nand_resume,
};
static struct platform_driver pxa3xx_nand_driver = { static struct platform_driver pxa3xx_nand_driver = {
.driver = { .driver = {
.name = "pxa3xx-nand", .name = "pxa3xx-nand",
.of_match_table = pxa3xx_nand_dt_ids, .of_match_table = pxa3xx_nand_dt_ids,
.pm = &pxa3xx_nand_pm_ops,
}, },
.probe = pxa3xx_nand_probe, .probe = pxa3xx_nand_probe,
.remove = pxa3xx_nand_remove, .remove = pxa3xx_nand_remove,
.suspend = pxa3xx_nand_suspend,
.resume = pxa3xx_nand_resume,
}; };
module_platform_driver(pxa3xx_nand_driver); module_platform_driver(pxa3xx_nand_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment