|
@@ -2504,7 +2504,7 @@ static int __exit atmci_remove(struct platform_device *pdev)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_PM
|
|
|
+#ifdef CONFIG_PM_SLEEP
|
|
|
static int atmci_suspend(struct device *dev)
|
|
|
{
|
|
|
struct atmel_mci *host = dev_get_drvdata(dev);
|
|
@@ -2559,17 +2559,15 @@ static int atmci_resume(struct device *dev)
|
|
|
|
|
|
return ret;
|
|
|
}
|
|
|
-static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume);
|
|
|
-#define ATMCI_PM_OPS (&atmci_pm)
|
|
|
-#else
|
|
|
-#define ATMCI_PM_OPS NULL
|
|
|
#endif
|
|
|
|
|
|
+static SIMPLE_DEV_PM_OPS(atmci_pm, atmci_suspend, atmci_resume);
|
|
|
+
|
|
|
static struct platform_driver atmci_driver = {
|
|
|
.remove = __exit_p(atmci_remove),
|
|
|
.driver = {
|
|
|
.name = "atmel_mci",
|
|
|
- .pm = ATMCI_PM_OPS,
|
|
|
+ .pm = &atmci_pm,
|
|
|
.of_match_table = of_match_ptr(atmci_dt_ids),
|
|
|
},
|
|
|
};
|