From patchwork Mon Sep 22 22:22:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 4951121 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E4DD3BEEA5 for ; Mon, 22 Sep 2014 22:24:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17AFF2024C for ; Mon, 22 Sep 2014 22:24:55 +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 4EAB1201FA for ; Mon, 22 Sep 2014 22:24:54 +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 1XWC0i-0000Ju-Hc; Mon, 22 Sep 2014 22:23:08 +0000 Received: from mail-wi0-f172.google.com ([209.85.212.172]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XWC0e-00009s-NR for linux-arm-kernel@lists.infradead.org; Mon, 22 Sep 2014 22:23:05 +0000 Received: by mail-wi0-f172.google.com with SMTP id em10so3812025wid.5 for ; Mon, 22 Sep 2014 15:22:41 -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:in-reply-to :references; bh=DDBkEMwNS24j0Z9ZQ17w+3IItpFMlVpFDFjeXyvUET4=; b=dcs/xNw4qTJdjz7etfkkB+KemZmviKCzBle/l36TDQn/ensvV/IkZTVyom13j7juwG CNjKu477+Rclm3fFCREQ3VI6vJDEbxufmJ5Q4hWiapNQ3U33SIis4feBPUy1q9yvhKaR VBY0kowuA69LGrPmksKByZZu/nXzoGazikVymxiyAp333e7bJNyXsbwAdRkXrpeEVDXb hHh+Tg9y64DJHztsOoZpMEHCn5FY5ncbkk9vBKAk4jo+Cuj/y3C+VGyfsuE5/WbTOrhj YP5BPUXP1ZO8ISmUnsQYxxqrHnXzmkqxypsmJEPzsu5KG2SA88W3KSJA5cz7O2RlEsda gXwg== X-Gm-Message-State: ALoCoQk0NFN85IBJ8fFJiTUfNv8D6yfAaiEx8BofW2uaF5ghZ1aZYokk0zaFGBKVkFENO8s0zPEc X-Received: by 10.181.13.105 with SMTP id ex9mr18417649wid.58.1411424561710; Mon, 22 Sep 2014 15:22:41 -0700 (PDT) Received: from srini-ThinkPad-X1-Carbon-2nd.dlink.com (host-78-149-10-230.as13285.net. [78.149.10.230]) by mx.google.com with ESMTPSA id cj7sm13720148wjc.37.2014.09.22.15.22.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 Sep 2014 15:22:40 -0700 (PDT) From: Srinivas Kandagatla To: Mauro Carvalho Chehab Subject: [PATCH 2/3] media: st-rc: move pm ops setup out of conditional compilation. Date: Mon, 22 Sep 2014 23:22:38 +0100 Message-Id: <1411424558-12761-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1411424501-12673-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1411424501-12673-1-git-send-email-srinivas.kandagatla@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140922_152304_983599_AAA5AC86 X-CRM114-Status: GOOD ( 11.86 ) X-Spam-Score: -0.7 (/) Cc: kernel@stlinux.com, linux-kernel@vger.kernel.org, Patrice Chotard , Srinivas Kandagatla , Maxime Coquelin , linux-arm-kernel@lists.infradead.org, linux-media@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=-2.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 This patch moves setting of pm_ops out of the CONFIG_PM_SLEEP condition. Setting pm ops under CONFIG_PM_SLEEP does not make any sense. This patch also remove unnecessary also remove CONFIG_PM condition for pm member in st_rc_driver structure. Signed-off-by: Srinivas Kandagatla --- drivers/media/rc/st_rc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/rc/st_rc.c b/drivers/media/rc/st_rc.c index e0f1312..03bbb09 100644 --- a/drivers/media/rc/st_rc.c +++ b/drivers/media/rc/st_rc.c @@ -376,9 +376,10 @@ static int st_rc_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(st_rc_pm_ops, st_rc_suspend, st_rc_resume); #endif +static SIMPLE_DEV_PM_OPS(st_rc_pm_ops, st_rc_suspend, st_rc_resume); + #ifdef CONFIG_OF static struct of_device_id st_rc_match[] = { { .compatible = "st,comms-irb", }, @@ -393,9 +394,7 @@ static struct platform_driver st_rc_driver = { .name = IR_ST_NAME, .owner = THIS_MODULE, .of_match_table = of_match_ptr(st_rc_match), -#ifdef CONFIG_PM .pm = &st_rc_pm_ops, -#endif }, .probe = st_rc_probe, .remove = st_rc_remove,