From patchwork Tue Oct 14 07:15:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5078601 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E05339F349 for ; Tue, 14 Oct 2014 07:19:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1FA7220142 for ; Tue, 14 Oct 2014 07:19:06 +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 3E86920148 for ; Tue, 14 Oct 2014 07:19:05 +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 1XdwLi-0008FV-Ol; Tue, 14 Oct 2014 07:16:50 +0000 Received: from mail-la0-f52.google.com ([209.85.215.52]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XdwLG-0007qy-Cw for linux-arm-kernel@lists.infradead.org; Tue, 14 Oct 2014 07:16:23 +0000 Received: by mail-la0-f52.google.com with SMTP id hz20so7826652lab.39 for ; Tue, 14 Oct 2014 00:16:01 -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=B6aGEyAoSYfAm/10cr8jSF4a6pnlS+G5Nv1f3r8FQhE=; b=ctLBBi2BIHIIi6+rSTuctbBPkPnmsno2gnOpP2iYd5lpXiU9rJJJ290ioTERWFnSEE QcBSHNFWyRJ30F4PZdjngkdDBCCuSylPasStx1GIZD13/seCwKU9x/zR+h55ShNfCAHt wUJ6LBxBZDrN8vzgC5srlMm3Ux4OZwYa2ihTpA3MegcmLhPRH7+v3InDky7mYnSqiFc5 45cB0mIGmOLYxVnikqrPmMPu/VbZA476vpgk22LKPdN91bOvtZgtlexXJss92XX7TPJg ooVrInvDShsl3XfxPWlMXMQNt9hWjh0OPfNZMB09eW9r4P5reSi3vILtFI6OWOx7jxmT BfDw== X-Gm-Message-State: ALoCoQkfXRrkwYPGbpVmLae0Ku5UYpJvuHYrjxL1V+Qf9g40O5q8yvLeXTCE1iOXmgN2j8XnosqI X-Received: by 10.112.147.225 with SMTP id tn1mr3311361lbb.37.1413270961823; Tue, 14 Oct 2014 00:16:01 -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 a2sm5279497lbs.21.2014.10.14.00.15.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Oct 2014 00:16:01 -0700 (PDT) From: Ulf Hansson To: Mauro Carvalho Chehab , linux-media@vger.kernel.org Subject: [PATCH 4/7] [media] exynos-gsc: Make runtime PM callbacks available for CONFIG_PM Date: Tue, 14 Oct 2014 09:15:37 +0200 Message-Id: <1413270940-4378-5-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1413270940-4378-1-git-send-email-ulf.hansson@linaro.org> References: <1413270940-4378-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141014_001622_651136_A12656EF X-CRM114-Status: GOOD ( 12.51 ) X-Spam-Score: -0.7 (/) Cc: Ulf Hansson , Kevin Hilman , Sylwester Nawrocki , Geert Uytterhoeven , linux-pm@vger.kernel.org, Pavel Machek , "Rafael J. Wysocki" , Tomasz Figa , linux-samsung-soc@vger.kernel.org, Philipp Zabel , Kukjin Kim , linux-arm-kernel@lists.infradead.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=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 There are no need to set up the runtime PM callbacks unless they are being used. Let's make them available for CONFIG_PM. Signed-off-by: Ulf Hansson --- drivers/media/platform/exynos-gsc/gsc-core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c index c3a050e..361a807 100644 --- a/drivers/media/platform/exynos-gsc/gsc-core.c +++ b/drivers/media/platform/exynos-gsc/gsc-core.c @@ -1150,6 +1150,7 @@ static int gsc_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM static int gsc_runtime_resume(struct device *dev) { struct gsc_dev *gsc = dev_get_drvdata(dev); @@ -1180,6 +1181,7 @@ static int gsc_runtime_suspend(struct device *dev) pr_debug("gsc%d: state: 0x%lx", gsc->id, gsc->state); return ret; } +#endif static int gsc_resume(struct device *dev) { @@ -1221,8 +1223,7 @@ static int gsc_suspend(struct device *dev) static const struct dev_pm_ops gsc_pm_ops = { .suspend = gsc_suspend, .resume = gsc_resume, - .runtime_suspend = gsc_runtime_suspend, - .runtime_resume = gsc_runtime_resume, + SET_PM_RUNTIME_PM_OPS(gsc_runtime_suspend, gsc_runtime_resume, NULL) }; static struct platform_driver gsc_driver = {