From patchwork Tue Apr 14 10:41:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 6214931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 62056BF4A6 for ; Tue, 14 Apr 2015 10:46:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8E98D20212 for ; Tue, 14 Apr 2015 10:46:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A1488201CD for ; Tue, 14 Apr 2015 10:46:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YhyJI-0001E9-G9; Tue, 14 Apr 2015 10:43:16 +0000 Received: from mail-la0-f45.google.com ([209.85.215.45]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YhyJB-000185-NS for linux-arm-kernel@lists.infradead.org; Tue, 14 Apr 2015 10:43:11 +0000 Received: by labbd9 with SMTP id bd9so4445217lab.2 for ; Tue, 14 Apr 2015 03:42:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=cm4TMgiPVD92jPpJHVT5E50KgaD4nZfP8sFDRPKZJs4=; b=U1OMMFZSFAStbCKIf3CS8L5+t/23LC/u+UgAWlYyIFZXIYrz/6TmPn5CP64gxZrqtO pvQo2urwW8jvP58DNsuC7m/xp6DOdXq8kKhwnecQSibcgeuQfJOTOh1vhkAE6YudLtF3 l9szGDypFK2+8bCgkc0IYb3BFqAQWFYNqXp7GSP5lPftZ+e4abwIF2a0r+Ai6ByVgPk6 uLNeDINiE9VmbVGmlKW7h21XKEjwBfIbfbodYgcB4Jw3jDhM9Izn48uID6QcAkCo441Z l7nbpF9f3Zn0qkNF29bvCz7yA+RCGOvctpgECrFDenR5rdkxVElhyVWdgEIRVnI4HOVN IPwg== X-Gm-Message-State: ALoCoQlWQDeHU1ianqo3tK3OnfEhdhIC9IVmTFMuajLBx2fFggC69grWJAA73kbt86RhG+P++DM9 X-Received: by 10.112.72.2 with SMTP id z2mr17281705lbu.39.1429008163568; Tue, 14 Apr 2015 03:42:43 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id nj1sm148443lbc.0.2015.04.14.03.42.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Apr 2015 03:42:42 -0700 (PDT) From: Ulf Hansson To: Russell King , Dmitry Torokhov Subject: [PATCH] input: ambakmi: Fix system PM by converting to modern callbacks Date: Tue, 14 Apr 2015 12:41:48 +0200 Message-Id: <1429008108-29295-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150414_034309_961089_D7538813 X-CRM114-Status: GOOD ( 10.51 ) X-Spam-Score: -0.7 (/) Cc: Ulf Hansson , linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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);