Commit 57aafe5c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman

staging: ste_rmi4: avoid unused function warnings

commit 9045a4a7 upstream.

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: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent caa08023
...@@ -1039,7 +1039,6 @@ static int synaptics_rmi4_remove(struct i2c_client *client) ...@@ -1039,7 +1039,6 @@ static int synaptics_rmi4_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM
/** /**
* synaptics_rmi4_suspend() - suspend the touch screen controller * synaptics_rmi4_suspend() - suspend the touch screen controller
* @dev: pointer to device structure * @dev: pointer to device structure
...@@ -1047,7 +1046,7 @@ static int synaptics_rmi4_remove(struct i2c_client *client) ...@@ -1047,7 +1046,7 @@ static int synaptics_rmi4_remove(struct i2c_client *client)
* This function is used to suspend the * This function is used to suspend the
* touch panel controller and returns integer * 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 */ /* Touch sleep mode */
int retval; int retval;
...@@ -1081,7 +1080,7 @@ static int synaptics_rmi4_suspend(struct device *dev) ...@@ -1081,7 +1080,7 @@ static int synaptics_rmi4_suspend(struct device *dev)
* This function is used to resume the touch panel * This function is used to resume the touch panel
* controller and returns integer. * controller and returns integer.
*/ */
static int synaptics_rmi4_resume(struct device *dev) static int __maybe_unused synaptics_rmi4_resume(struct device *dev)
{ {
int retval; int retval;
unsigned char intr_status; unsigned char intr_status;
...@@ -1112,8 +1111,6 @@ static int synaptics_rmi4_resume(struct device *dev) ...@@ -1112,8 +1111,6 @@ static int synaptics_rmi4_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(synaptics_rmi4_dev_pm_ops, synaptics_rmi4_suspend, static SIMPLE_DEV_PM_OPS(synaptics_rmi4_dev_pm_ops, synaptics_rmi4_suspend,
synaptics_rmi4_resume); synaptics_rmi4_resume);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment