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: 37706 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CFFD8202A1 for ; Mon, 22 Sep 2014 22:22:53 +0000 (UTC) Received: by mail-la0-f72.google.com with SMTP id gi9sf3776785lab.7 for ; Mon, 22 Sep 2014 15:22:52 -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=PHiRcaM8xgOcG5BHVQ6EzJK4RJxI1i+Cbm47w6XG2ds=; b=ZFFcNeAwYLeULvEmhn0f6k3BISVHmoad866GZqI//JCXqTSF0f9o5WYtmMG5at8QcN IFhv7SBlkRRINPbARqwCc92oVAUJK3NRR+SQEVKo+acbF7X0Ei6Fy+53gUAq8s7XoHVv U7sxQQNWufAEE5e4IdsR4D+PSQpszV9KVZ2lYsSm3ShY4YJDxaB5YIxKaNeXp9wQN3mS m2aFRxLIxwoji/QvRElds6JnANCiZIbCnSvRUm1zSbQsfmRoOkvvCB4396DLv43KBC8D k8XQw0Yrium6K4SqNxdXhNvbTDV8ZtXHfzhCIDuF0+71caLQl9LahUvZYu3/oRv0mgNW FsZg== X-Gm-Message-State: ALoCoQlNmL76sNtCrdc/oeY3Wx/vDszrP8VPCTTSDZdwgSU5M6tywx11QPH55hBMAlUPLNl+rVWG X-Received: by 10.152.42.229 with SMTP id r5mr9045lal.8.1411424572399; Mon, 22 Sep 2014 15:22:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.131 with SMTP id f3ls518001lae.38.gmail; Mon, 22 Sep 2014 15:22:52 -0700 (PDT) X-Received: by 10.152.10.203 with SMTP id k11mr29063013lab.30.1411424572262; Mon, 22 Sep 2014 15:22:52 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com [209.85.217.176]) by mx.google.com with ESMTPS id zu10si16134005lbb.80.2014.09.22.15.22.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Sep 2014 15:22:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id w7so2791085lbi.7 for ; Mon, 22 Sep 2014 15:22:52 -0700 (PDT) X-Received: by 10.112.76.6 with SMTP id g6mr27100949lbw.22.1411424572189; Mon, 22 Sep 2014 15:22:52 -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.130.169 with SMTP id of9csp321654lbb; Mon, 22 Sep 2014 15:22:51 -0700 (PDT) X-Received: by 10.70.133.231 with SMTP id pf7mr33190756pdb.20.1411424570728; Mon, 22 Sep 2014 15:22:50 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qn3si17699531pac.39.2014.09.22.15.22.50 for ; Mon, 22 Sep 2014 15:22:50 -0700 (PDT) Received-SPF: none (google.com: linux-media-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755157AbaIVWWo (ORCPT + 2 others); Mon, 22 Sep 2014 18:22:44 -0400 Received: from mail-we0-f170.google.com ([74.125.82.170]:55379 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755145AbaIVWWm (ORCPT ); Mon, 22 Sep 2014 18:22:42 -0400 Received: by mail-we0-f170.google.com with SMTP id x48so2232626wes.29 for ; Mon, 22 Sep 2014 15:22:41 -0700 (PDT) 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 Cc: Maxime Coquelin , Patrice Chotard , linux-arm-kernel@lists.infradead.org, kernel@stlinux.com, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla 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> Sender: linux-media-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: srinivas.kandagatla@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.217.176 as permitted sender) smtp.mail=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: , 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,