From patchwork Mon Sep 12 15:32:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101809 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp909886qgf; Mon, 12 Sep 2016 08:34:12 -0700 (PDT) X-Received: by 10.98.103.132 with SMTP id t4mr30097897pfj.12.1473694452485; Mon, 12 Sep 2016 08:34:12 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p190si22142446pfb.292.2016.09.12.08.34.12; Mon, 12 Sep 2016 08:34:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934197AbcILPdq (ORCPT + 4 others); Mon, 12 Sep 2016 11:33:46 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:62684 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934192AbcILPdl (ORCPT ); Mon, 12 Sep 2016 11:33:41 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0LkySz-1b9JbM1qFR-00anIq; Mon, 12 Sep 2016 17:33:25 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , Sakari Ailus , =?utf-8?q?Pali_Roh=C3=A1r?= , Pavel Machek , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] [media] ad5820: use __maybe_unused for PM functions Date: Mon, 12 Sep 2016 17:32:57 +0200 Message-Id: <20160912153322.3098750-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:ukRMbokWa18ZRSqOHzldmskPrKvFsJA/tU17Bw3Ak0mMRc1UCru rJAX8H6nco8tvNsIzwSCkTifA3ks6p/IyOoDzgqYBNaR2qhZpZK9OWYfwdOnyrzClCXy4h8 I7pxn8qfjLmHHmgWJMjRwzwvwcGav21XTB/38CbgwsC7AZMgB0f84Tk0EeLkPC7+wUOT/Ac HSmb+PdDARZM1kMJLm/Mg== X-UI-Out-Filterresults: notjunk:1; V01:K0:nfatZiTbDo4=:bnimZBZkKURbpE3uzFPCj0 cE7KwlEpg6g+sf5LzknSS2Ky/8i+Bw0vmDb9GTDeyPKk/cwacoZWKk86NFZ50KFYNegEHOfeb tWIxz/dKi4SOsav0evdQ7vS5jkG4qw+GMvaN1atfZmJR6vsVexxzMvANfaP44SBtta79itKOS r/36bWxCctUPUzxMSTUQjWiCMr/3dwA0jwARYm2ux+eCMamGhtOntxxtzOPdetLyjeaMJ4M8q FHX7FzPLnC3lDUCAkJ+VvXHXjtd4U6JDmrvl7DKMJWEbyEgq9VwGWjhN3uGEAKe2hvJPF+HiC dSPbno5w8WK4XstlU2y513jdrCQ3paZPBsIqeI88c0n7XdnsC8Gegp6PtR+t6ixBUMjcRPbGR tpyE4bqM0Us1KNa8DHfKm1FYZUWrAijE9krrzsDHMgIxAijwdQ8m6dUAHcglIz0+CQ3AMrSKM eNmtIu38ysYMPherKqb0mHxTP6WEiQLEcM+XeRScN9tuJiYKmbvZoRH0Vxw1tX2UkLLdwnFrJ FtZxUtwAOY2oZeFr5lgIb/Bi+y7GE9gM5R4a70x1zcorD634fPoJz98IAuBhi/vo9HUCDkI4r 4C9+6QIq2MOvznScJ8G9kEB7CnGtZJu2v3SO+5SvESEpOwo6fO7j6/4lfSe/+67nHHbY3BuKg bxDFdXhIY3VfqT8aWKmsfpZhLPBSH+gAPg2QvIFjUqlAfc2HJ01mTeKHTlCpONpiWZO4= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The new ad5820 driver uses #ifdef to hide the suspend/resume functions, but gets it wrong when CONFIG_PM_SLEEP is disabled: drivers/media/i2c/ad5820.c:286:12: error: 'ad5820_resume' defined but not used [-Werror=unused-function] drivers/media/i2c/ad5820.c:274:12: error: 'ad5820_suspend' defined but not used [-Werror=unused-function] This replaces the #ifdef with a __maybe_unused annotation that is simpler and harder to get wrong, avoiding the warning. Signed-off-by: Arnd Bergmann Fixes: bee3d5115611 ("[media] ad5820: Add driver for auto-focus coil") --- drivers/media/i2c/ad5820.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/i2c/ad5820.c b/drivers/media/i2c/ad5820.c index fd4c5f67163d..beab2f381b81 100644 --- a/drivers/media/i2c/ad5820.c +++ b/drivers/media/i2c/ad5820.c @@ -269,9 +269,7 @@ static const struct v4l2_subdev_internal_ops ad5820_internal_ops = { /* * I2C driver */ -#ifdef CONFIG_PM - -static int ad5820_suspend(struct device *dev) +static int __maybe_unused ad5820_suspend(struct device *dev) { struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct v4l2_subdev *subdev = i2c_get_clientdata(client); @@ -283,7 +281,7 @@ static int ad5820_suspend(struct device *dev) return ad5820_power_off(coil, false); } -static int ad5820_resume(struct device *dev) +static int __maybe_unused ad5820_resume(struct device *dev) { struct i2c_client *client = container_of(dev, struct i2c_client, dev); struct v4l2_subdev *subdev = i2c_get_clientdata(client); @@ -295,13 +293,6 @@ static int ad5820_resume(struct device *dev) return ad5820_power_on(coil, true); } -#else - -#define ad5820_suspend NULL -#define ad5820_resume NULL - -#endif /* CONFIG_PM */ - static int ad5820_probe(struct i2c_client *client, const struct i2c_device_id *devid) { From patchwork Mon Sep 12 15:32:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101808 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp910023qgf; Mon, 12 Sep 2016 08:34:27 -0700 (PDT) X-Received: by 10.66.136.49 with SMTP id px17mr34157508pab.83.1473694467559; Mon, 12 Sep 2016 08:34:27 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b194si3728101pfb.196.2016.09.12.08.34.27; Mon, 12 Sep 2016 08:34:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-media-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-media-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934192AbcILPd6 (ORCPT + 4 others); Mon, 12 Sep 2016 11:33:58 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:49348 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932628AbcILPdy (ORCPT ); Mon, 12 Sep 2016 11:33:54 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue101) with ESMTPA (Nemesis) id 0MbhXp-1bQz0z3A97-00IzR6; Mon, 12 Sep 2016 17:33:40 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , Songjun Wu , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] [media] atmel-isc: mark PM functions as __maybe_unused Date: Mon, 12 Sep 2016 17:32:58 +0200 Message-Id: <20160912153322.3098750-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160912153322.3098750-1-arnd@arndb.de> References: <20160912153322.3098750-1-arnd@arndb.de> X-Provags-ID: V03:K0:CCzcV6KN4FZzBxjRx9edufcU9p9SGxrqV2hEiBuXvLaKdLKfD8p lrMOYSkVX8Sa6Zx7yA+crWRhZgQjmHF8NRmEDPaMEu7FrgtFCdIalQV7VMYrVVBZXrulAr+ YlyCsBQdXQSdL6I5k/q+H8+GijG0Zw35wOhyb5A93XsOfYZJdCD5X8Pan5WE+bgW1UCovC/ SPTIBzsZAxiqUgqvBf3hQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:mWzhSz8Y4I0=:WTibrDM+AxWXqXgC9wr8aX 63gbri1LlQgKw+2CnEAXGIYjNJnfGG66fbwncbtKuoZC2eblMCngnAwpiYX7Ay0vucTKVw68a Mry9hj6yGo4yedXLJGx5Co95wOQZrUa8bc3SL+Q5QC9FhwkXB8NwrHCemDK4qlmCdnckdTS0P 62NpmZXbUSqhNOaxEg4RBJhbPDU2mdKcctsSDuh3uRiBcGxUalTRwsBchkPSWL9ehrFyaOWLJ vMkCcThKeSc4N2LbUKdtaFbDNajBsBiD9qgQEgGPzypN0RXf0o5tRW6hO7oIaWwF7ldMZbXGJ hDzQIXxELr9wxk8jHMkPF8abqjwhvne2zUPuXBrZ3nOxgkq3cVRRNFxviuQlrbVroQHpAK7fh cz5otzdx7eD51nC87jxDdPJuCV1xk1Y4jvFPCSSn76+9AOG7Lw18/T8UDZyDkipSuGlHrR4XA wR7cV+SyThIe21cyoBu20mIJahsOyvpG0Kc7M65yvEzCbsepSzMXB2R9XaVK9OuNbttr8SZx0 OolvJRnH5gGgbkLRdW/AQwp3WWUGWVo7Rt0M25fqhsESdqMCwBSz1n9dlP9xdFH354QGhJ1it 89/UDyxi4b86aNnTSbMxL3VBe9xA69E5ICnTpZZElrKkY34weCjdccJj5OBi/S3d1sazXkMrB AyUANEcgzfSYLRA1QYpB8ec6r/obaK3/H5+UwuBP0hJzDzxuHarhde6uSc5Ix5OHp2cM= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org The newly added atmel-isc driver uses SET_RUNTIME_PM_OPS() to refer to its suspend/resume functions, causing a warning when CONFIG_PM is not set: media/platform/atmel/atmel-isc.c:1477:12: error: 'isc_runtime_resume' defined but not used [-Werror=unused-function] media/platform/atmel/atmel-isc.c:1467:12: error: 'isc_runtime_suspend' defined but not used [-Werror=unused-function] This adds __maybe_unused annotations to avoid the warning without adding an error-prone #ifdef around it. Signed-off-by: Arnd Bergmann --- drivers/media/platform/atmel/atmel-isc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c index db6773de92f0..a9ab7ae89f04 100644 --- a/drivers/media/platform/atmel/atmel-isc.c +++ b/drivers/media/platform/atmel/atmel-isc.c @@ -1464,7 +1464,7 @@ static int atmel_isc_remove(struct platform_device *pdev) return 0; } -static int isc_runtime_suspend(struct device *dev) +static int __maybe_unused isc_runtime_suspend(struct device *dev) { struct isc_device *isc = dev_get_drvdata(dev); @@ -1474,7 +1474,7 @@ static int isc_runtime_suspend(struct device *dev) return 0; } -static int isc_runtime_resume(struct device *dev) +static int __maybe_unused isc_runtime_resume(struct device *dev) { struct isc_device *isc = dev_get_drvdata(dev); int ret;