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: 47142 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 04A262121F for ; Tue, 14 Apr 2015 10:42:45 +0000 (UTC) Received: by wixv7 with SMTP id v7sf3294887wix.0 for ; Tue, 14 Apr 2015 03:42:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=cm4TMgiPVD92jPpJHVT5E50KgaD4nZfP8sFDRPKZJs4=; b=FUkFOeob0AeNt4vYbYr0zepIP1KDlzQyZs6f/rUQHP8FDsO70IEHsYBC32PKoX7qBo HwTkrDbXMDakHLeO78YMvXhtrv/N1kmNy4FUPf+vamsCwy5KmBZJaUQqmg+/Oct460MP b/IOdCFDCf8tkCMP0b0tFrms4FtPxaTX/elxffOZgJtl1sZzwbu4cdcaD5NEKs9xHtPm as0Pb8rsuagvEfwiFp0meT9fgmcciXYrG044HadKFAl7nc5Faw89+K3D4GHfZT1YCdOt 6wMhwNrP3orOGLaEn6EnFPWCpyBj/gTovJXrJom2/rL2e97On93CdnYrJh3VB/kcDglb Vs9g== X-Gm-Message-State: ALoCoQmA8z9B6f4zXFs68ZR7V9GUziddLsNMajjh1bE92YIcFNpI85/HTpcI+a8wOKFPGqB4iaGP X-Received: by 10.194.7.233 with SMTP id m9mr170339wja.1.1429008164345; Tue, 14 Apr 2015 03:42:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.163 with SMTP id r3ls27719laj.70.gmail; Tue, 14 Apr 2015 03:42:44 -0700 (PDT) X-Received: by 10.112.210.230 with SMTP id mx6mr17645220lbc.64.1429008164186; Tue, 14 Apr 2015 03:42:44 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id uz5si538942lac.4.2015.04.14.03.42.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Apr 2015 03:42:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by layy10 with SMTP id y10so4467911lay.0 for ; Tue, 14 Apr 2015 03:42:44 -0700 (PDT) X-Received: by 10.112.163.168 with SMTP id yj8mr17070220lbb.36.1429008164048; Tue, 14 Apr 2015 03:42:44 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.67.65 with SMTP id l1csp1764278lbt; Tue, 14 Apr 2015 03:42:43 -0700 (PDT) X-Received: by 10.153.5.36 with SMTP id cj4mr17319437lad.69.1429008163736; Tue, 14 Apr 2015 03:42:43 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com. [209.85.217.171]) by mx.google.com with ESMTPS id r3si513791lar.107.2015.04.14.03.42.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Apr 2015 03:42:43 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by lbcga7 with SMTP id ga7so4692748lbc.1 for ; Tue, 14 Apr 2015 03:42:43 -0700 (PDT) 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 Cc: linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, Ulf Hansson 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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);