From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935190AbbKTV7x (ORCPT ); Fri, 20 Nov 2015 16:59:53 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:57554 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751598AbbKTV7w (ORCPT ); Fri, 20 Nov 2015 16:59:52 -0500 From: Arnd Bergmann To: Greg Kroah-Hartman Cc: Krzysztof Kozlowski , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org Subject: [PATCH] staging: ste_rmi4: avoid unused function warnings Date: Fri, 20 Nov 2015 22:59:14 +0100 Message-ID: <4938658.kvPtQAFlP6@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:7gp6mdeHlJl3h5WdMho55nbZDLE0IYlqRWAy4nOk9knDigPOrKM XlfJu94lPWLaaJr602V5/seBVdKNGKDuMvl0JRcF2gHcJtTVLI+vF7VwCW7YUnWotR0GpWc IN8DhUMXG33dZnevaZRVcCIH4GENy9qejE7OojxnjtAdMS5GyMrS+HzXtNuwjd3CugzynZl qki87Erl6BA9lIM4pWKFA== X-UI-Out-Filterresults: notjunk:1;V01:K0:xZvRLxwOxHY=:KWsZ14PiIiCkn0Oix+qLqo ER4FCZ+dPdO2ZJKBKxSataoWmF6+D3VpwTeGnOHbDJ6UGsNVVTyk6MIgXiYB63RV3Xpkrd7O/ 7tR7S02L/NxctRJgJhpco4EdMG/Y8HEfTTcKFuT39Ryne28dMJwza96mwuCqJKd/H/TXBbFlH C9FkCTxUvDanIl7kYPOBpzbE44kWm/CGQNtizs4EECvAYG8v5e9VmZfPTWC/WVHK/mjoEYfFy Ormb61Qi2jE0c+9dWsatFjp61tNU+WkL2Eh3mfkERrdBotijGLtC5JS9xrEO/DIvgiE4YPpOz ELELsWNMt++ehk3SjUSqDRvkzRnXt/GfQroJvJMxIlswI24frtW1k6PGxKj1V8tSAAYqJ5sAV pTxSEDjvnCzLd/CP4IjXPyySg0tu2qqeWx1jv+q7BhBMInaajvEJcIBYdcbptJqCUm4OpyqdD O8pl70COKYNUYd1bvOKxt0HppbeFngStrV9MxxcPJVYIW/stqdQqjcKEiOSdGhiLdHRwdXeyn YSYBd3/dHhjvc1+/fZC/U0/noohFZ2mk5miivDt95RYxhXE7LaqToW3hDaD8JuR9ekzox0IPv Vkt3dBmWNKhy2OKc22cULX7QIFowgIvnopxY36/hLTwwXCFSffBPLkJdibNf6kzlS6AzcQxzV Hj2jWfNf8HMMDqUMRT6iqdQZU+fRc56MXN+y0SaNbT/4rXkl/Z/CQ3Tghkyz9wXRqd+0XDWZg EANngzuMe7lSYjaK Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The rmi4 touchscreen driver encloses the power-management functions in #ifdef CONFIG_PM, but the smtcfb_pci_suspend/resume functions are only really used when CONFIG_PM_SLEEP is also set, as a frequent gcc warning shows: ste_rmi4/synaptics_i2c_rmi4.c:1050:12: warning: 'synaptics_rmi4_suspend' defined but not used ste_rmi4/synaptics_i2c_rmi4.c:1084:12: warning: 'synaptics_rmi4_resume' defined but not used This changes the driver to remove the #ifdef and instead mark the functions as __maybe_unused, which is a nicer anyway, as it provides build testing for all the code in all configurations and is harder to get wrong. Signed-off-by: Arnd Bergmann diff --git a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c index 824d460911ec..58ccafb97344 100644 --- a/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c +++ b/drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c @@ -1039,7 +1039,6 @@ static int synaptics_rmi4_remove(struct i2c_client *client) return 0; } -#ifdef CONFIG_PM /** * synaptics_rmi4_suspend() - suspend the touch screen controller * @dev: pointer to device structure @@ -1047,7 +1046,7 @@ static int synaptics_rmi4_remove(struct i2c_client *client) * This function is used to suspend the * touch panel controller and returns integer */ -static int synaptics_rmi4_suspend(struct device *dev) +static int __maybe_unused synaptics_rmi4_suspend(struct device *dev) { /* Touch sleep mode */ int retval; @@ -1081,7 +1080,7 @@ static int synaptics_rmi4_suspend(struct device *dev) * This function is used to resume the touch panel * controller and returns integer. */ -static int synaptics_rmi4_resume(struct device *dev) +static int __maybe_unused synaptics_rmi4_resume(struct device *dev) { int retval; unsigned char intr_status; @@ -1112,8 +1111,6 @@ static int synaptics_rmi4_resume(struct device *dev) return 0; } -#endif - static SIMPLE_DEV_PM_OPS(synaptics_rmi4_dev_pm_ops, synaptics_rmi4_suspend, synaptics_rmi4_resume);