From patchwork Thu Sep 22 09:48:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101757 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp2500683qgf; Thu, 22 Sep 2016 02:48:58 -0700 (PDT) X-Received: by 10.98.103.8 with SMTP id b8mr1757875pfc.122.1474537738311; Thu, 22 Sep 2016 02:48:58 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 27si1367651pfn.124.2016.09.22.02.48.57; Thu, 22 Sep 2016 02:48:58 -0700 (PDT) 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 S1756963AbcIVJsz (ORCPT + 27 others); Thu, 22 Sep 2016 05:48:55 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52924 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753695AbcIVJsx (ORCPT ); Thu, 22 Sep 2016 05:48:53 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0MVEDt-1bU5DV1cWj-00YNjf; Thu, 22 Sep 2016 11:48:20 +0200 From: Arnd Bergmann To: Alessandro Zummo , Alexandre Belloni Cc: Arnd Bergmann , Gabriele Mazzotta , Andy Shevchenko , rtc-linux@googlegroups.com, linux-kernel@vger.kernel.org Subject: [PATCH] rtc: cmos: avoid unused function warning Date: Thu, 22 Sep 2016 11:48:00 +0200 Message-Id: <20160922094817.2325831-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:HUI6sjMSIAjXFzY725X0NjPqsbSX464GRbDtcVCX+O1svKSaLTe zbqGlUrby0AtMX9aRyrBXBbK7VhcgHUAUw7plZW0HOLY4BAlZ1AAUJiFHhHpeuYQ0FQB09P wXiGg9wAOae9J0oLmLYKmYU0xeeEyUBYNrJ9Yoc0cyPQVYn27UsdQ1DxpFP5Qe1Rg8wcJgB eZQFGeuOmZF4xtTTyLttg== X-UI-Out-Filterresults: notjunk:1; V01:K0:aXe5Q4IVn7U=:lkAh/Q54M+YugZrA4qlmQT g82Ha5cMmp7aI+8KIcicGGAllbvLDP32UanCs/8ykQMS9ecPn9hQ3/rNQepWQsmoQdDrtJMcK WCoTrWlK3LSOCN2W3xSxHOHDHv6bFZDZxels/j9Lz97b/FiYPITZ72DA1PzwEUEVM1mzkijD3 Fve+F7eaXP4G45JL139Tc5Mpd7RjpustTnb5LloAwkOl8RpfHDOHorNMTKxhvs3nMApSE58ol 1vzoW+NKNre1SAIBrkwusdfBocB0rKEPSzq70Pa7BpZ3SDspNHAdeuDvMiwXfxxn7kkER2wmp 89N1xmiJATHPrcdSbXKoSikObxobUjfIM9V635L60AcIbBXG3BcuwsNlIG25WcZRIpV7df2/m Ezh0mb97fYuxtchFcjnnBzdI73hfX/HuIZNJyL+huIuCwp2IndqhKKEOSumnTc3YIbmZGEX9j XpMZ2LAuDGf12Y9JE9pmNSDA+28IChLyWinfy6mJUwOktjOoIbPbEljeB4huPMcU9c8Qeiwg2 tATwUWoQjxyiSorpLyE2LKIg9IccJLUIQN0hMWkTPN5rWQxzUrIm/hdWoOgR4pogX7cGrzklu 1AMENwVcWQYLDRo95ZU5hAMETlbavR86LhEq/8WpO0qop106/qwnw/J+GRNIqiIz5qfXjWgRx e9tO+vgsrh3Px7GI2ibvUkbLHbUIqhTwEE3FAriIyINsULO9MPcvfuEaEWsVU6uzLX04= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A bug fix for the ACPI side of this driver caused a harmless build warning: drivers/rtc/rtc-cmos.c:1115:13: error: 'cmos_check_acpi_rtc_status' defined but not used [-Werror=unused-function] static void cmos_check_acpi_rtc_status(struct device *dev, We can avoid the warning and simplify the driver at the same time by removing the #ifdef for CONFIG_PM and rely on the SIMPLE_DEV_PM_OPS() to set everything up correctly. cmos_resume() has to get marked as __maybe_unused so we don't introduce another warning, and the two variants of cmos_poweroff() can get merged into one using an IS_ENABLED() check. Fixes: 983bf1256edb ("rtc: cmos: Clear ACPI-driven alarms upon resume") Signed-off-by: Arnd Bergmann --- drivers/rtc/rtc-cmos.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) -- 2.9.0 diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 2943a0d58a3a..dd3d59806ffa 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c @@ -848,8 +848,6 @@ static int cmos_aie_poweroff(struct device *dev) return retval; } -#ifdef CONFIG_PM - static int cmos_suspend(struct device *dev) { struct cmos_rtc *cmos = dev_get_drvdata(dev); @@ -898,11 +896,12 @@ static int cmos_suspend(struct device *dev) */ static inline int cmos_poweroff(struct device *dev) { + if (!IS_ENABLED(CONFIG_PM)) + return -ENOSYS; + return cmos_suspend(dev); } -#ifdef CONFIG_PM_SLEEP - static void cmos_check_wkalrm(struct device *dev) { struct cmos_rtc *cmos = dev_get_drvdata(dev); @@ -922,7 +921,7 @@ static void cmos_check_wkalrm(struct device *dev) static void cmos_check_acpi_rtc_status(struct device *dev, unsigned char *rtc_control); -static int cmos_resume(struct device *dev) +static int __maybe_unused cmos_resume(struct device *dev) { struct cmos_rtc *cmos = dev_get_drvdata(dev); unsigned char tmp; @@ -975,16 +974,6 @@ static int cmos_resume(struct device *dev) return 0; } -#endif -#else - -static inline int cmos_poweroff(struct device *dev) -{ - return -ENOSYS; -} - -#endif - static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume); /*----------------------------------------------------------------*/ @@ -1278,9 +1267,7 @@ static struct platform_driver cmos_platform_driver = { .shutdown = cmos_platform_shutdown, .driver = { .name = driver_name, -#ifdef CONFIG_PM .pm = &cmos_pm_ops, -#endif .of_match_table = of_match_ptr(of_cmos_match), } };