On Tue, Apr 14, 2015 at 12:41:48PM +0200, Ulf Hansson wrote:
> 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@xxxxxxxxxx>
If this has not been noticed since end of 2013 maybe we should drop the
driver?
> ---
> drivers/input/serio/ambakmi.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
> index 8b748d9..058e1d8 100644
> --- a/drivers/input/serio/ambakmi.c
> +++ b/drivers/input/serio/ambakmi.c
> @@ -175,15 +175,19 @@ static int amba_kmi_remove(struct amba_device *dev)
> return 0;
> }
>
> -static int amba_kmi_resume(struct amba_device *dev)
> +#ifdef CONFIG_PM_SLEEP
> +static int 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);
>
> return 0;
> }
> +#endif
> +
> +static SIMPLE_DEV_PM_OPS(amba_kmi_dev_pm_ops, NULL, amba_kmi_resume);
>
> static struct amba_id amba_kmi_idtable[] = {
> {
> @@ -199,11 +203,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);
> --
> 1.9.1
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
