staging: ste_rmi4: avoid unused function warnings
PATCH 1/1 staging: ste_rmi4: avoid unused function warnings
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.
drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c +2 -5
@@ -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);
Quoted 8 lines · Arnd Bergmann
The rmi4 touchscreen driver encloses the power-management functions in #ifdef
CONFIG_PM, but the smtcfb_pci_suspend/resume functions are only really used whenCONFIG_PM_SLEEPis also set, as a frequent gcc warning shows:
ste_rmi4/synaptics_i2c_rmi4.c:1050:12: warning: 'synaptics_rmi4_suspend' defined but not usedste_rmi4/synaptics_i2c_rmi4.c:1084:12: warning: 'synaptics_rmi4_resume' defined but not used
Quoted 6 lines
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 <[email protected]>
Yours,
Linus Walleij