diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2015-07-16 10:32:40 -0700 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-09-30 13:20:35 +0100 |
| commit | b10a5073d42e98be98566df881cc3e36bfa9702f (patch) | |
| tree | 16ab053ffed077eb8e3c644fde97adba9f094a93 /drivers/input | |
| parent | cd8811d46b43a7a6e9033af26093f26f599e66da (diff) | |
| download | linux-stable-b10a5073d42e98be98566df881cc3e36bfa9702f.tar.gz linux-stable-b10a5073d42e98be98566df881cc3e36bfa9702f.tar.bz2 linux-stable-b10a5073d42e98be98566df881cc3e36bfa9702f.zip | |
Input: ambakmi - fix system PM by converting to modern callbacks
commit cee3d8ccbecb8af6788edaaac46befca78b000dc upstream.
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: 26825cfd90f9 (ARM: 7914/1: amba: Drop legacy PM support ...)
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/ambakmi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c index 8b748d99b934..c6606cacb6a7 100644 --- a/drivers/input/serio/ambakmi.c +++ b/drivers/input/serio/ambakmi.c @@ -175,9 +175,9 @@ static int amba_kmi_remove(struct amba_device *dev) 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 */ serio_reconnect(kmi->io); @@ -185,6 +185,8 @@ static int amba_kmi_resume(struct amba_device *dev) return 0; } +static SIMPLE_DEV_PM_OPS(amba_kmi_dev_pm_ops, NULL, amba_kmi_resume); + static struct amba_id amba_kmi_idtable[] = { { .id = 0x00041050, @@ -199,11 +201,11 @@ static struct amba_driver ambakmi_driver = { .drv = { .name = "kmi-pl050", .owner = THIS_MODULE, + .pm = &amba_kmi_dev_pm_ops, }, .id_table = amba_kmi_idtable, .probe = amba_kmi_probe, .remove = amba_kmi_remove, - .resume = amba_kmi_resume, }; module_amba_driver(ambakmi_driver); |