From patchwork Wed Mar 2 15:59:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 8483391 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 32451C0553 for ; Wed, 2 Mar 2016 16:09:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D6BA20351 for ; Wed, 2 Mar 2016 16:09:36 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8616020364 for ; Wed, 2 Mar 2016 16:09:35 +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 1ab9JR-0002Af-6V; Wed, 02 Mar 2016 16:07:45 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ab9Hy-00008g-27 for linux-arm-kernel@lists.infradead.org; Wed, 02 Mar 2016 16:06:49 +0000 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue103) with ESMTPA (Nemesis) id 0Lsw94-1Zv1xi1Yl8-012cCJ; Wed, 02 Mar 2016 17:00:40 +0100 From: Arnd Bergmann To: Laurent Pinchart , Mauro Carvalho Chehab Subject: [PATCH 13/14] [media] omap3isp: use IS_ENABLED() to hide pm functions Date: Wed, 2 Mar 2016 16:59:05 +0100 Message-Id: <1456934350-1389172-14-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456934350-1389172-1-git-send-email-arnd@arndb.de> References: <1456934350-1389172-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:fWaIY3IYoq1zj7EM1WmCExFOjpV99OMcIx/S13lIIO0+m6u4SFM q2TF1C17fhFRUIM4LgEv4Fp3qCE/oeCzK7nSb0W7pW2+cS++cmyYMwZEKTD7tA1SSfCMvLP KgStj8phPj+5lvjw6dCch5u8wf3UyKHWrjZnWZN89qB/7pvfmdv3RySxKc4UXHhKE+7nQXn KtUb7fOm5VNZSzRnvmVyw== X-UI-Out-Filterresults: notjunk:1; V01:K0:VZeJWMp6beQ=:A2t+jhGx6tsHvipjtWwZzz Au9GsZ2517ZbH9SMnbsdC0+3wr3xgwtGM945JzAaekda2i7DrriZzeqD6u2+RB06yi0zVGEMY 7SV1xHFJ5pLeD0n99GNYh5q6QP1ym7yDK85iDRIIu/1KSzpwDDGlywNbbREn/rFTqPwxyeHM+ Wk3S1kwRPSU6DWcwo/Bz4CM79dmBUYgrZcr/VfVoZkDMghA3Tmnnco/v7m9a9JjFU2/IkTBpp tPQwkFEy8mLP6n3XO2e59k9oJKIdIJtpWG3TDQN//bmrYKOmuS/zYPkrv0Pda9zyChunzbl8t Dq6PYgxFigC9TDqtzJhR7pVHHGcLk+GJdgNf6+U57RP7PqqgqybALRt2tDGStTBZ12YCwF1Qi u/s7ZM9CVUi2m4pusaHcdoEUZvrlioOY7vjMXXkZKqK4Y/rejxhUwRloFse4TEHTUDMyNO0Ob 0pK+RsXVV76Mei2aDlAzUdTrk4O49wRaGc1eBVfcviLAoyuL+p6hTMUqaMUt9RYHnj9RxICct arAxtSJg90iNzWTclHTDFrmuDkPYXk3Ji0nzgM+/mxA3qMwtJZLuw968nxhnWwLCKIHC1b8gM xLq6KV2x/YmEqkDVB56nB8ObTL6LTBckTAxH2dbn12oETj3FR1YjrZjoyMj3Gjqp/PXv65FKa Sd+fUCDGmHDi/HyHDZqVXQM+3iQ+b1g6qLybGrS2OYA9P3yW0DbXpeN9MnR/Wk10337Y= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160302_080615_172169_569E4EC3 X-CRM114-Status: GOOD ( 13.80 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 The omap3isp driver hides is power management functions using #ifdef but it fails to hide the isp_suspend_modules/isp_resume_modules functions in the same way, which leads to a build warning when CONFIG_PM is disabled: drivers/media/platform/omap3isp/isp.c:1183:12: error: 'isp_suspend_modules' defined but not used [-Werror=unused-function] drivers/media/platform/omap3isp/isp.c:1217:13: error: 'isp_resume_modules' defined but not used [-Werror=unused-function] As the driver manually defines its dev_pm_ops structure and all members are NULL without CONFIG_PM, we can simply avoid referencing the structure using an IS_ENABLED() check, and drop all the #ifdef to avoid all warnings. Signed-off-by: Arnd Bergmann --- drivers/media/platform/omap3isp/isp.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index f9e5245f26ac..7f118baca270 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -1713,8 +1713,6 @@ void omap3isp_print_status(struct isp_device *isp) dev_dbg(isp->dev, "--------------------------------------------\n"); } -#ifdef CONFIG_PM - /* * Power management support. * @@ -1785,15 +1783,6 @@ static void isp_pm_complete(struct device *dev) isp_resume_modules(isp); } -#else - -#define isp_pm_prepare NULL -#define isp_pm_suspend NULL -#define isp_pm_resume NULL -#define isp_pm_complete NULL - -#endif /* CONFIG_PM */ - static void isp_unregister_entities(struct isp_device *isp) { omap3isp_csi2_unregister_entities(&isp->isp_csi2a); @@ -2611,7 +2600,7 @@ static struct platform_driver omap3isp_driver = { .id_table = omap3isp_id_table, .driver = { .name = "omap3isp", - .pm = &omap3isp_pm_ops, + .pm = IS_ENABLED(CONFIG_PM) ? &omap3isp_pm_ops : NULL, .of_match_table = omap3isp_of_table, }, };