From patchwork Tue Feb 23 13:57:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102702 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1844289lbl; Tue, 23 Feb 2016 05:58:39 -0800 (PST) X-Received: by 10.98.68.212 with SMTP id m81mr46185971pfi.135.1456235918520; Tue, 23 Feb 2016 05:58:38 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ud10si47515091pab.54.2016.02.23.05.58.38; Tue, 23 Feb 2016 05:58:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752953AbcBWN63 (ORCPT + 30 others); Tue, 23 Feb 2016 08:58:29 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:64669 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752378AbcBWN60 (ORCPT ); Tue, 23 Feb 2016 08:58:26 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MbxjC-1aFzpr2gZq-00JL6r; Tue, 23 Feb 2016 14:58:05 +0100 From: Arnd Bergmann To: Tony Lindgren Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] ARM: omap2: mark unused functions as __maybe_unused Date: Tue, 23 Feb 2016 14:57:51 +0100 Message-Id: <1456235876-4088840-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456235876-4088840-1-git-send-email-arnd@arndb.de> References: <1456235876-4088840-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:cAicmy4lcbZjANGavrBov907mkNm2ocDBM+LaDBAnqpbPuASJfu HZzvm+53AQ1ifnlUsdNMQSw+86jns52uylRR1ZOUUFA9sPRt8YLGvtrtp5MHMjr6tWs80ze p0Cx5DDsdYzq4gtFRM5zFfqJTMBzMv7SlZ2p9g0Kpl9MRIDVtdifj9/m1xmqD/AziaydC/a lXMgsYTKYmlRz2Ssf8tUw== X-UI-Out-Filterresults: notjunk:1; V01:K0:8V0WgFWcBBc=:w/WS82CFk1yDmDHFoIdgAs 3XKb8BDEe0DQbl3Eq9m4XmcI0Yz1xFsFTWupKUVt5xz3NY6yLim8PngVXmP+OuU2g3eaS7Hky uzCutl57XMFLq4QivZmqPSZCBvB4/4vLj2pw23BOvcKUQQW7dClYAq2T0B+0M3Q4AgTLp+oki FFHHWgu2MHVCxKg+Fb6HeIHEpV9Y0FdN9y8W7ZzjngclrIQVuVAqZOJycq7rrUZwpZyHIRjQN iqTZuViThB4pKhSuRanDRWev0EAxLUjydPTyD2aYtFHv+UoM8R53N2H0nE5xeT8UIKbk82Tud zqAcKhOqMQYOl8HkEW+cAegw6piQ3l7cqFMoIn+imNrWUEFZCUrP98Uw0SO2kNASSCffx5lY9 8KNZiQze2t2EznbBEwtLERilfM7N1MMnQNP/SyHqmzTrt9TulQp16yM4vuk/iSW0wT/5o5oq3 Pj7ZVjYy6/bQVaKU9qnVFXnHz82DQQMOo5bvngYfVEoCXeyMdevuYn/xeO2C20RC0YQp4U7SG RRhjaZRpM+/yTmjrYx+JCjJrcdVtOx8Vx9GNrjNtuLVGMs8W4EDUK/DzN2cIjxfi7VhYFJPxm 0hGRejBQe6T3U2+RClX8+jOBnhpBm2dTBPfH6I2B1HieWCpqvXjhrE4hNXDfsjZmuOqez2wzi HX17tveLghW8MjJ6IgtnY4ImDaS1CDlZC8hEZUWvhyeHzu6s7+mql479iSF3/VZpPqMQ= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The omap_generic_init() and omap_hwmod_init_postsetup() functions are used in the initialization for all OMAP2+ SoC types, but in the extreme case that those are all disabled, we get a warning about unused code: arch/arm/mach-omap2/io.c:412:123: error: 'omap_hwmod_init_postsetup' defined but not used [-Werror=unused-function] arch/arm/mach-omap2/board-generic.c:30:123: error: 'omap_generic_init' defined but not used [-Werror=unused-function] This annotates both as __maybe_unused to shut up that warning. Signed-off-by: Arnd Bergmann --- arch/arm/mach-omap2/board-generic.c | 2 +- arch/arm/mach-omap2/io.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.7.0 diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index bab814d2f37d..d75ec64ae0b5 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -28,7 +28,7 @@ static const struct of_device_id omap_dt_match_table[] __initconst = { { } }; -static void __init omap_generic_init(void) +static void __init __maybe_unused omap_generic_init(void) { omapdss_early_init_of(); diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 3c87e40650cf..f192fc7fd4f7 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -409,7 +409,7 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) return omap_hwmod_set_postsetup_state(oh, *(u8 *)data); } -static void __init omap_hwmod_init_postsetup(void) +static void __init __maybe_unused omap_hwmod_init_postsetup(void) { u8 postsetup_state; From patchwork Tue Feb 23 13:57:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102701 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1844365lbl; Tue, 23 Feb 2016 05:58:49 -0800 (PST) X-Received: by 10.66.233.194 with SMTP id ty2mr1844243pac.126.1456235929312; Tue, 23 Feb 2016 05:58:49 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ua9si14011986pab.25.2016.02.23.05.58.48; Tue, 23 Feb 2016 05:58:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753082AbcBWN6j (ORCPT + 30 others); Tue, 23 Feb 2016 08:58:39 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:58945 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752954AbcBWN6g (ORCPT ); Tue, 23 Feb 2016 08:58:36 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MHYWy-1aUv9t2glI-003Kf9; Tue, 23 Feb 2016 14:58:13 +0100 From: Arnd Bergmann To: Tony Lindgren Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] ARM: omap1/ams-delta: warn about failed regulator enable Date: Tue, 23 Feb 2016 14:57:53 +0100 Message-Id: <1456235876-4088840-4-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1456235876-4088840-1-git-send-email-arnd@arndb.de> References: <1456235876-4088840-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:nv2so6xYQsQO7azwUlTBuPYCOiLtApEwfSdIelgjNCW/1IJX66D CoDkPu6BMSNYBeL+nW5usPlcisAwTamJ9wPKW4BIekIWNPRPuTPrM/vk3mRW+AA/fAVPrlQ SztNSuktmjiA5Q+mRTfTzvSGB3/Xx2U0/v2hwAQerQK6QyQtXz2J1QgGnnTevWPmd3x6AQ0 3TbiTjExkwICDiUfwMrdw== X-UI-Out-Filterresults: notjunk:1; V01:K0:nSqpW/y7Jog=:PiULBmefyGHB7CS6hI0SPK Du6SZNLJC/lyamSCd21q/Sru40qHAOTkGwft5JAVKIjk2E6NOSMpr/TxnA6wcEvywqhWmMM/S kb3v8FiWLChu1dwXbLwp28C2uFUTpRuSl4+iKumVV4j4vdp8K3sizB2PH/hmJbEpvWdsq+uRH kebw7HEr9DOlIL63aqv1IXY3/vqP2F4bJ6KfGgIiVK9s3zPQ+3CYmPh3Yu/B1bR8z+rRBS1qf trmzKNpy1J5FV1jJd9Stzmkx7ydIhynhS6iQuJgOa6/vTxGh6IdMvHbkwrGV33AEB8AIeKaH0 vnun8WVaANT08vTboxZ9bUWrTxINRtkhFenDneJZrpQjnW5Qy69kEfaZA6h3U/es6CDo2aj0h 2mcEhhJdrLN27IwL24xZ8Vffy1l7NYgrwh2T2mXqgPEmYy6geskHGRRlLYp7b4q0qUlhP4GMw UzeadeMw3PsAYPmOjlXeWCtnEAQBny86KgvOCairghxciBc1F76GYWikPISErQ1UK/m5h6PQN 9yFz5q4uIqI+lh1Z6/cy9oODca+/dExa4/nU37AZTfqv1vBk7C+u1XjiUZfK6w2P0i1wnjJld Nr6o0mN67L5clLOhvGyMSA8Ez3DxqRinMH0/GYAqFbkQi9odHRt0fEjSYqLz1hM5v4yAyu2FM dT8ZkIC5PArYaACuBqj2V4YvjGcd7+cys3FnEUcZclkcJ1tY/3zJANnvEqae55trQ4a8= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The modem pm handler in the ams-delta board uses regulator_enable() but does not check for a successful return code: board-ams-delta.c:521:3: error: ignoring return value of 'regulator_enable', declared with attribute warn_unused_result [-Werror=unused-result] It is not easy to propagate that return code to the callers in uart_configure_port/uart_suspend_port/uart_resume_port, unless we change all UART drivers, and it is unclear what those would do with the return code. Instead, this patch uses a runtime warning to replace the compiletime warning. I have checked that the regulator in question is hardcoded to a fixed-voltage GPIO regulator, and that should never fail to get enabled if I understand the code right. Signed-off-by: Arnd Bergmann --- arch/arm/mach-omap1/board-ams-delta.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- 2.7.0 diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 6613a6ff5dbc..6cbc69c92913 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -510,6 +510,7 @@ static void __init ams_delta_init(void) static void modem_pm(struct uart_port *port, unsigned int state, unsigned old) { struct modem_private_data *priv = port->private_data; + int ret; if (IS_ERR(priv->regulator)) return; @@ -518,9 +519,16 @@ static void modem_pm(struct uart_port *port, unsigned int state, unsigned old) return; if (state == 0) - regulator_enable(priv->regulator); + ret = regulator_enable(priv->regulator); else if (old == 0) - regulator_disable(priv->regulator); + ret = regulator_disable(priv->regulator); + else + ret = 0; + + if (ret) + dev_warn(port->dev, + "ams_delta modem_pm: failed to %sable regulator: %d\n", + state ? "dis" : "en", ret); } static struct plat_serial8250_port ams_delta_modem_ports[] = {