Commit cee3d8cc authored by Ulf Hansson's avatar Ulf Hansson Committed by Dmitry Torokhov

Input: ambakmi - fix system PM by converting to modern callbacks

The legacy system PM support has long time ago been dropped from the
AMBA bus. Align to that by converting to the modern system PM
callbacks.

Fixes: 26825cfd (ARM: 7914/1: amba: Drop legacy PM support ...)
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent e1443d28
...@@ -175,9 +175,9 @@ static int amba_kmi_remove(struct amba_device *dev) ...@@ -175,9 +175,9 @@ static int amba_kmi_remove(struct amba_device *dev)
return 0; return 0;
} }
static int amba_kmi_resume(struct amba_device *dev) static int __maybe_unused amba_kmi_resume(struct device *dev)
{ {
struct amba_kmi_port *kmi = amba_get_drvdata(dev); struct amba_kmi_port *kmi = dev_get_drvdata(dev);
/* kick the serio layer to rescan this port */ /* kick the serio layer to rescan this port */
serio_reconnect(kmi->io); serio_reconnect(kmi->io);
...@@ -185,6 +185,8 @@ static int amba_kmi_resume(struct amba_device *dev) ...@@ -185,6 +185,8 @@ static int amba_kmi_resume(struct amba_device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(amba_kmi_dev_pm_ops, NULL, amba_kmi_resume);
static struct amba_id amba_kmi_idtable[] = { static struct amba_id amba_kmi_idtable[] = {
{ {
.id = 0x00041050, .id = 0x00041050,
...@@ -199,11 +201,11 @@ static struct amba_driver ambakmi_driver = { ...@@ -199,11 +201,11 @@ static struct amba_driver ambakmi_driver = {
.drv = { .drv = {
.name = "kmi-pl050", .name = "kmi-pl050",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &amba_kmi_dev_pm_ops,
}, },
.id_table = amba_kmi_idtable, .id_table = amba_kmi_idtable,
.probe = amba_kmi_probe, .probe = amba_kmi_probe,
.remove = amba_kmi_remove, .remove = amba_kmi_remove,
.resume = amba_kmi_resume,
}; };
module_amba_driver(ambakmi_driver); module_amba_driver(ambakmi_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