From patchwork Mon Sep 21 15:47:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 53983 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id C507222B04 for ; Mon, 21 Sep 2015 15:52:02 +0000 (UTC) Received: by wicmn1 with SMTP id mn1sf32795956wic.1 for ; Mon, 21 Sep 2015 08:52:02 -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:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=mJhcGL1fz6oXKjmzMXYiOyKqWClrRNd4RacQsXz+Utc=; b=brWeyHRfzWCiIzbkdFjdkcixeqiXrVfn9AwDBQCJ3VFzR0Eu9qOY2Mq10PtdM3LPX2 INUYnCOpvx9Q+D/5+Vinty+Fsm/dgJJ5DqkjJCwjz3PI7m5+mn0SZMJSDaRoc/iY1zUF Ij/bzYtWsd/7+g9qIQmv/vaNrgrLd67mdrcsImHyvnhq28dADH24j0Ktk46Fh0/olp2m 0jsfb0bqK5rNdJb4t6aeF4vGtdu2n7auf8DKe+iCpFV0xZyh7z5q4+XHP0tkgXrtewag 4tWLfk8Ci9evS4q5yb7XSwCelvAtbCqsDquDYKWoEAm/UhiQMw8sq0wy0IaisSAlzpdl dwZA== X-Gm-Message-State: ALoCoQmbV0p6Ba5LOBMVjsvILJEJAJewlRqxsPUfW/L5Hkz9yjll7kJ3QR7DlyFjayJPAl33QXts X-Received: by 10.181.29.103 with SMTP id jv7mr2211533wid.0.1442850722048; Mon, 21 Sep 2015 08:52:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.134 with SMTP id s6ls274220las.58.gmail; Mon, 21 Sep 2015 08:52:01 -0700 (PDT) X-Received: by 10.112.198.66 with SMTP id ja2mr7863817lbc.22.1442850721867; Mon, 21 Sep 2015 08:52:01 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id li9si16425591lbc.121.2015.09.21.08.52.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Sep 2015 08:52:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by lahg1 with SMTP id g1so71209754lah.1 for ; Mon, 21 Sep 2015 08:52:01 -0700 (PDT) X-Received: by 10.112.151.106 with SMTP id up10mr7952959lbb.106.1442850721680; Mon, 21 Sep 2015 08:52:01 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1785855lbq; Mon, 21 Sep 2015 08:52:00 -0700 (PDT) X-Received: by 10.68.176.227 with SMTP id cl3mr25724224pbc.8.1442850720644; Mon, 21 Sep 2015 08:52:00 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rz7si38715567pbb.156.2015.09.21.08.51.59; Mon, 21 Sep 2015 08:52:00 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933038AbbIUPv6 (ORCPT + 30 others); Mon, 21 Sep 2015 11:51:58 -0400 Received: from foss.arm.com ([217.140.101.70]:54008 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932637AbbIUPsM (ORCPT ); Mon, 21 Sep 2015 11:48:12 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3D89328; Mon, 21 Sep 2015 08:48:16 -0700 (PDT) Received: from e103737-lin.cambridge.arm.com (e103737-lin.cambridge.arm.com [10.1.207.150]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 9F7743F2E5; Mon, 21 Sep 2015 08:48:10 -0700 (PDT) From: Sudeep Holla To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sudeep Holla , Thomas Gleixner , "Rafael J. Wysocki" , Darren Hart , platform-driver-x86@vger.kernel.org Subject: [PATCH 05/17] platform: x86: remove misuse of IRQF_NO_SUSPEND flag Date: Mon, 21 Sep 2015 16:47:01 +0100 Message-Id: <1442850433-5903-6-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442850433-5903-1-git-send-email-sudeep.holla@arm.com> References: <1442850433-5903-1-git-send-email-sudeep.holla@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: sudeep.holla@arm.com 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.43 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The IRQF_NO_SUSPEND flag is used to identify the interrupts that should be left enabled so as to allow them to work as expected during the suspend-resume cycle, but doesn't guarantee that it will wake the system from a suspended state, enable_irq_wake is recommended to be used for the wakeup. This patch removes the use of IRQF_NO_SUSPEND flags and uses newly introduce PM wakeup APIs dev_pm_{set,clear}_wake_irq. Cc: Darren Hart Cc: platform-driver-x86@vger.kernel.org Signed-off-by: Sudeep Holla --- drivers/platform/x86/intel_mid_powerbtn.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c index 22606d6b2af3..1fc0de870ff8 100644 --- a/drivers/platform/x86/intel_mid_powerbtn.c +++ b/drivers/platform/x86/intel_mid_powerbtn.c @@ -24,6 +24,7 @@ #include #include #include +#include #define DRIVER_NAME "msic_power_btn" @@ -76,14 +77,17 @@ static int mfld_pb_probe(struct platform_device *pdev) input_set_capability(input, EV_KEY, KEY_POWER); - error = request_threaded_irq(irq, NULL, mfld_pb_isr, IRQF_NO_SUSPEND, - DRIVER_NAME, input); + error = request_threaded_irq(irq, NULL, mfld_pb_isr, 0, + DRIVER_NAME, input); if (error) { dev_err(&pdev->dev, "Unable to request irq %d for mfld power" "button\n", irq); goto err_free_input; } + device_init_wakeup(&pdev->dev, true); + dev_pm_set_wake_irq(&pdev->dev, irq); + error = input_register_device(input); if (error) { dev_err(&pdev->dev, "Unable to register input dev, error " @@ -124,6 +128,8 @@ static int mfld_pb_remove(struct platform_device *pdev) struct input_dev *input = platform_get_drvdata(pdev); int irq = platform_get_irq(pdev, 0); + dev_pm_clear_wake_irq(&pdev->dev); + device_init_wakeup(&pdev->dev, false); free_irq(irq, input); input_unregister_device(input);