Skip to content

L
linux
Commit 02b6a58b authored by Jingoo Han's avatar Jingoo Han Committed by Dmitry Torokhov
Browse files
Options

Input: touchscreen - use __maybe_unused instead of ifdef around suspend/resume 

Use __maybe_unused instead of ifdef guards around suspend/resume
functions, in order to increase build coverage and fix build warnings.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 572081a4
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 78 deletions
drivers/input/touchscreen/ad7877.c
View file @ 02b6a58b
...@@ -820,8 +820,7 @@ static int ad7877_remove(struct spi_device *spi) ...@@ -820,8 +820,7 @@ static int ad7877_remove(struct spi_device *spi)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused ad7877_suspend(struct device *dev)
static int ad7877_suspend(struct device *dev)
{ {
struct ad7877 *ts = dev_get_drvdata(dev); struct ad7877 *ts = dev_get_drvdata(dev);
...@@ -830,7 +829,7 @@ static int ad7877_suspend(struct device *dev) ...@@ -830,7 +829,7 @@ static int ad7877_suspend(struct device *dev)
return 0; return 0;
} }
static int ad7877_resume(struct device *dev) static int __maybe_unused ad7877_resume(struct device *dev)
{ {
struct ad7877 *ts = dev_get_drvdata(dev); struct ad7877 *ts = dev_get_drvdata(dev);
...@@ -838,7 +837,6 @@ static int ad7877_resume(struct device *dev) ...@@ -838,7 +837,6 @@ static int ad7877_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume); static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume);
......
drivers/input/touchscreen/ad7879.c
View file @ 02b6a58b
...@@ -284,8 +284,7 @@ static void ad7879_close(struct input_dev* input) ...@@ -284,8 +284,7 @@ static void ad7879_close(struct input_dev* input)
__ad7879_disable(ts); __ad7879_disable(ts);
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused ad7879_suspend(struct device *dev)
static int ad7879_suspend(struct device *dev)
{ {
struct ad7879 *ts = dev_get_drvdata(dev); struct ad7879 *ts = dev_get_drvdata(dev);
...@@ -301,7 +300,7 @@ static int ad7879_suspend(struct device *dev) ...@@ -301,7 +300,7 @@ static int ad7879_suspend(struct device *dev)
return 0; return 0;
} }
static int ad7879_resume(struct device *dev) static int __maybe_unused ad7879_resume(struct device *dev)
{ {
struct ad7879 *ts = dev_get_drvdata(dev); struct ad7879 *ts = dev_get_drvdata(dev);
...@@ -316,7 +315,6 @@ static int ad7879_resume(struct device *dev) ...@@ -316,7 +315,6 @@ static int ad7879_resume(struct device *dev)
return 0; return 0;
} }
#endif
SIMPLE_DEV_PM_OPS(ad7879_pm_ops, ad7879_suspend, ad7879_resume); SIMPLE_DEV_PM_OPS(ad7879_pm_ops, ad7879_suspend, ad7879_resume);
EXPORT_SYMBOL(ad7879_pm_ops); EXPORT_SYMBOL(ad7879_pm_ops);
......
drivers/input/touchscreen/ads7846.c
View file @ 02b6a58b
...@@ -883,8 +883,7 @@ static irqreturn_t ads7846_irq(int irq, void *handle) ...@@ -883,8 +883,7 @@ static irqreturn_t ads7846_irq(int irq, void *handle)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused ads7846_suspend(struct device *dev)
static int ads7846_suspend(struct device *dev)
{ {
struct ads7846 *ts = dev_get_drvdata(dev); struct ads7846 *ts = dev_get_drvdata(dev);
...@@ -906,7 +905,7 @@ static int ads7846_suspend(struct device *dev) ...@@ -906,7 +905,7 @@ static int ads7846_suspend(struct device *dev)
return 0; return 0;
} }
static int ads7846_resume(struct device *dev) static int __maybe_unused ads7846_resume(struct device *dev)
{ {
struct ads7846 *ts = dev_get_drvdata(dev); struct ads7846 *ts = dev_get_drvdata(dev);
...@@ -927,7 +926,6 @@ static int ads7846_resume(struct device *dev) ...@@ -927,7 +926,6 @@ static int ads7846_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume); static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume);
......
drivers/input/touchscreen/atmel_mxt_ts.c
View file @ 02b6a58b
...@@ -2244,8 +2244,7 @@ static int mxt_remove(struct i2c_client *client) ...@@ -2244,8 +2244,7 @@ static int mxt_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused mxt_suspend(struct device *dev)
static int mxt_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct mxt_data *data = i2c_get_clientdata(client); struct mxt_data *data = i2c_get_clientdata(client);
...@@ -2261,7 +2260,7 @@ static int mxt_suspend(struct device *dev) ...@@ -2261,7 +2260,7 @@ static int mxt_suspend(struct device *dev)
return 0; return 0;
} }
static int mxt_resume(struct device *dev) static int __maybe_unused mxt_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct mxt_data *data = i2c_get_clientdata(client); struct mxt_data *data = i2c_get_clientdata(client);
...@@ -2276,7 +2275,6 @@ static int mxt_resume(struct device *dev) ...@@ -2276,7 +2275,6 @@ static int mxt_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume); static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume);
......
drivers/input/touchscreen/auo-pixcir-ts.c
View file @ 02b6a58b
...@@ -417,8 +417,7 @@ static void auo_pixcir_input_close(struct input_dev *dev) ...@@ -417,8 +417,7 @@ static void auo_pixcir_input_close(struct input_dev *dev)
return; return;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused auo_pixcir_suspend(struct device *dev)
static int auo_pixcir_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct auo_pixcir_ts *ts = i2c_get_clientdata(client); struct auo_pixcir_ts *ts = i2c_get_clientdata(client);
...@@ -450,7 +449,7 @@ static int auo_pixcir_suspend(struct device *dev) ...@@ -450,7 +449,7 @@ static int auo_pixcir_suspend(struct device *dev)
return ret; return ret;
} }
static int auo_pixcir_resume(struct device *dev) static int __maybe_unused auo_pixcir_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct auo_pixcir_ts *ts = i2c_get_clientdata(client); struct auo_pixcir_ts *ts = i2c_get_clientdata(client);
...@@ -479,7 +478,6 @@ static int auo_pixcir_resume(struct device *dev) ...@@ -479,7 +478,6 @@ static int auo_pixcir_resume(struct device *dev)
return ret; return ret;
} }
#endif
static SIMPLE_DEV_PM_OPS(auo_pixcir_pm_ops, static SIMPLE_DEV_PM_OPS(auo_pixcir_pm_ops,
auo_pixcir_suspend, auo_pixcir_resume); auo_pixcir_suspend, auo_pixcir_resume);
......
drivers/input/touchscreen/cy8ctmg110_ts.c
View file @ 02b6a58b
...@@ -291,8 +291,7 @@ static int cy8ctmg110_probe(struct i2c_client *client, ...@@ -291,8 +291,7 @@ static int cy8ctmg110_probe(struct i2c_client *client,
return err; return err;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused cy8ctmg110_suspend(struct device *dev)
static int cy8ctmg110_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct cy8ctmg110 *ts = i2c_get_clientdata(client); struct cy8ctmg110 *ts = i2c_get_clientdata(client);
...@@ -306,7 +305,7 @@ static int cy8ctmg110_suspend(struct device *dev) ...@@ -306,7 +305,7 @@ static int cy8ctmg110_suspend(struct device *dev)
return 0; return 0;
} }
static int cy8ctmg110_resume(struct device *dev) static int __maybe_unused cy8ctmg110_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct cy8ctmg110 *ts = i2c_get_clientdata(client); struct cy8ctmg110 *ts = i2c_get_clientdata(client);
...@@ -319,7 +318,6 @@ static int cy8ctmg110_resume(struct device *dev) ...@@ -319,7 +318,6 @@ static int cy8ctmg110_resume(struct device *dev)
} }
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(cy8ctmg110_pm, cy8ctmg110_suspend, cy8ctmg110_resume); static SIMPLE_DEV_PM_OPS(cy8ctmg110_pm, cy8ctmg110_suspend, cy8ctmg110_resume);
......
drivers/input/touchscreen/cyttsp_core.c
View file @ 02b6a58b
...@@ -472,8 +472,7 @@ static int cyttsp_disable(struct cyttsp *ts) ...@@ -472,8 +472,7 @@ static int cyttsp_disable(struct cyttsp *ts)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused cyttsp_suspend(struct device *dev)
static int cyttsp_suspend(struct device *dev)
{ {
struct cyttsp *ts = dev_get_drvdata(dev); struct cyttsp *ts = dev_get_drvdata(dev);
int retval = 0; int retval = 0;
...@@ -491,7 +490,7 @@ static int cyttsp_suspend(struct device *dev) ...@@ -491,7 +490,7 @@ static int cyttsp_suspend(struct device *dev)
return retval; return retval;
} }
static int cyttsp_resume(struct device *dev) static int __maybe_unused cyttsp_resume(struct device *dev)
{ {
struct cyttsp *ts = dev_get_drvdata(dev); struct cyttsp *ts = dev_get_drvdata(dev);
...@@ -507,8 +506,6 @@ static int cyttsp_resume(struct device *dev) ...@@ -507,8 +506,6 @@ static int cyttsp_resume(struct device *dev)
return 0; return 0;
} }
#endif
SIMPLE_DEV_PM_OPS(cyttsp_pm_ops, cyttsp_suspend, cyttsp_resume); SIMPLE_DEV_PM_OPS(cyttsp_pm_ops, cyttsp_suspend, cyttsp_resume);
EXPORT_SYMBOL_GPL(cyttsp_pm_ops); EXPORT_SYMBOL_GPL(cyttsp_pm_ops);
......
drivers/input/touchscreen/edt-ft5x06.c
View file @ 02b6a58b
...@@ -1092,8 +1092,7 @@ static int edt_ft5x06_ts_remove(struct i2c_client *client) ...@@ -1092,8 +1092,7 @@ static int edt_ft5x06_ts_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused edt_ft5x06_ts_suspend(struct device *dev)
static int edt_ft5x06_ts_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -1103,7 +1102,7 @@ static int edt_ft5x06_ts_suspend(struct device *dev) ...@@ -1103,7 +1102,7 @@ static int edt_ft5x06_ts_suspend(struct device *dev)
return 0; return 0;
} }
static int edt_ft5x06_ts_resume(struct device *dev) static int __maybe_unused edt_ft5x06_ts_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -1112,7 +1111,6 @@ static int edt_ft5x06_ts_resume(struct device *dev) ...@@ -1112,7 +1111,6 @@ static int edt_ft5x06_ts_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(edt_ft5x06_ts_pm_ops, static SIMPLE_DEV_PM_OPS(edt_ft5x06_ts_pm_ops,
edt_ft5x06_ts_suspend, edt_ft5x06_ts_resume); edt_ft5x06_ts_suspend, edt_ft5x06_ts_resume);
......
drivers/input/touchscreen/eeti_ts.c
View file @ 02b6a58b
...@@ -264,8 +264,7 @@ static int eeti_ts_remove(struct i2c_client *client) ...@@ -264,8 +264,7 @@ static int eeti_ts_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused eeti_ts_suspend(struct device *dev)
static int eeti_ts_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct eeti_ts_priv *priv = i2c_get_clientdata(client); struct eeti_ts_priv *priv = i2c_get_clientdata(client);
...@@ -284,7 +283,7 @@ static int eeti_ts_suspend(struct device *dev) ...@@ -284,7 +283,7 @@ static int eeti_ts_suspend(struct device *dev)
return 0; return 0;
} }
static int eeti_ts_resume(struct device *dev) static int __maybe_unused eeti_ts_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct eeti_ts_priv *priv = i2c_get_clientdata(client); struct eeti_ts_priv *priv = i2c_get_clientdata(client);
...@@ -302,7 +301,6 @@ static int eeti_ts_resume(struct device *dev) ...@@ -302,7 +301,6 @@ static int eeti_ts_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(eeti_ts_pm, eeti_ts_suspend, eeti_ts_resume); static SIMPLE_DEV_PM_OPS(eeti_ts_pm, eeti_ts_suspend, eeti_ts_resume);
......
drivers/input/touchscreen/egalax_ts.c
View file @ 02b6a58b
...@@ -239,8 +239,7 @@ static const struct i2c_device_id egalax_ts_id[] = { ...@@ -239,8 +239,7 @@ static const struct i2c_device_id egalax_ts_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, egalax_ts_id); MODULE_DEVICE_TABLE(i2c, egalax_ts_id);
#ifdef CONFIG_PM_SLEEP static int __maybe_unused egalax_ts_suspend(struct device *dev)
static int egalax_ts_suspend(struct device *dev)
{ {
static const u8 suspend_cmd[MAX_I2C_DATA_LEN] = { static const u8 suspend_cmd[MAX_I2C_DATA_LEN] = {
0x3, 0x6, 0xa, 0x3, 0x36, 0x3f, 0x2, 0, 0, 0 0x3, 0x6, 0xa, 0x3, 0x36, 0x3f, 0x2, 0, 0, 0
...@@ -252,13 +251,12 @@ static int egalax_ts_suspend(struct device *dev) ...@@ -252,13 +251,12 @@ static int egalax_ts_suspend(struct device *dev)
return ret > 0 ? 0 : ret; return ret > 0 ? 0 : ret;
} }
static int egalax_ts_resume(struct device *dev) static int __maybe_unused egalax_ts_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
return egalax_wake_up_device(client); return egalax_wake_up_device(client);
} }
#endif
static SIMPLE_DEV_PM_OPS(egalax_ts_pm_ops, egalax_ts_suspend, egalax_ts_resume); static SIMPLE_DEV_PM_OPS(egalax_ts_pm_ops, egalax_ts_suspend, egalax_ts_resume);
......
drivers/input/touchscreen/ili210x.c
View file @ 02b6a58b
...@@ -311,8 +311,7 @@ static int ili210x_i2c_remove(struct i2c_client *client) ...@@ -311,8 +311,7 @@ static int ili210x_i2c_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused ili210x_i2c_suspend(struct device *dev)
static int ili210x_i2c_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -322,7 +321,7 @@ static int ili210x_i2c_suspend(struct device *dev) ...@@ -322,7 +321,7 @@ static int ili210x_i2c_suspend(struct device *dev)
return 0; return 0;
} }
static int ili210x_i2c_resume(struct device *dev) static int __maybe_unused ili210x_i2c_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -331,7 +330,6 @@ static int ili210x_i2c_resume(struct device *dev) ...@@ -331,7 +330,6 @@ static int ili210x_i2c_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(ili210x_i2c_pm, static SIMPLE_DEV_PM_OPS(ili210x_i2c_pm,
ili210x_i2c_suspend, ili210x_i2c_resume); ili210x_i2c_suspend, ili210x_i2c_resume);
......
drivers/input/touchscreen/ipaq-micro-ts.c
View file @ 02b6a58b
...@@ -122,8 +122,7 @@ static int micro_ts_probe(struct platform_device *pdev) ...@@ -122,8 +122,7 @@ static int micro_ts_probe(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused micro_ts_suspend(struct device *dev)
static int micro_ts_suspend(struct device *dev)
{ {
struct touchscreen_data *ts = dev_get_drvdata(dev); struct touchscreen_data *ts = dev_get_drvdata(dev);
...@@ -132,7 +131,7 @@ static int micro_ts_suspend(struct device *dev) ...@@ -132,7 +131,7 @@ static int micro_ts_suspend(struct device *dev)
return 0; return 0;
} }
static int micro_ts_resume(struct device *dev) static int __maybe_unused micro_ts_resume(struct device *dev)
{ {
struct touchscreen_data *ts = dev_get_drvdata(dev); struct touchscreen_data *ts = dev_get_drvdata(dev);
struct input_dev *input = ts->input; struct input_dev *input = ts->input;
...@@ -146,7 +145,6 @@ static int micro_ts_resume(struct device *dev) ...@@ -146,7 +145,6 @@ static int micro_ts_resume(struct device *dev)
return 0; return 0;
} }
#endif
static const struct dev_pm_ops micro_ts_dev_pm_ops = { static const struct dev_pm_ops micro_ts_dev_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(micro_ts_suspend, micro_ts_resume) SET_SYSTEM_SLEEP_PM_OPS(micro_ts_suspend, micro_ts_resume)
......
drivers/input/touchscreen/mms114.c
View file @ 02b6a58b
...@@ -515,8 +515,7 @@ static int mms114_probe(struct i2c_client *client, ...@@ -515,8 +515,7 @@ static int mms114_probe(struct i2c_client *client,
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused mms114_suspend(struct device *dev)
static int mms114_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct mms114_data *data = i2c_get_clientdata(client); struct mms114_data *data = i2c_get_clientdata(client);
...@@ -540,7 +539,7 @@ static int mms114_suspend(struct device *dev) ...@@ -540,7 +539,7 @@ static int mms114_suspend(struct device *dev)
return 0; return 0;
} }
static int mms114_resume(struct device *dev) static int __maybe_unused mms114_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct mms114_data *data = i2c_get_clientdata(client); struct mms114_data *data = i2c_get_clientdata(client);
...@@ -559,7 +558,6 @@ static int mms114_resume(struct device *dev) ...@@ -559,7 +558,6 @@ static int mms114_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(mms114_pm_ops, mms114_suspend, mms114_resume); static SIMPLE_DEV_PM_OPS(mms114_pm_ops, mms114_suspend, mms114_resume);
......
drivers/input/touchscreen/pixcir_i2c_ts.c
View file @ 02b6a58b
...@@ -347,8 +347,7 @@ static void pixcir_input_close(struct input_dev *dev) ...@@ -347,8 +347,7 @@ static void pixcir_input_close(struct input_dev *dev)
pixcir_stop(ts); pixcir_stop(ts);
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused pixcir_i2c_ts_suspend(struct device *dev)
static int pixcir_i2c_ts_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client); struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client);
...@@ -377,7 +376,7 @@ static int pixcir_i2c_ts_suspend(struct device *dev) ...@@ -377,7 +376,7 @@ static int pixcir_i2c_ts_suspend(struct device *dev)
return ret; return ret;
} }
static int pixcir_i2c_ts_resume(struct device *dev) static int __maybe_unused pixcir_i2c_ts_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client); struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client);
...@@ -405,7 +404,6 @@ static int pixcir_i2c_ts_resume(struct device *dev) ...@@ -405,7 +404,6 @@ static int pixcir_i2c_ts_resume(struct device *dev)
return ret; return ret;
} }
#endif
static SIMPLE_DEV_PM_OPS(pixcir_dev_pm_ops, static SIMPLE_DEV_PM_OPS(pixcir_dev_pm_ops,
pixcir_i2c_ts_suspend, pixcir_i2c_ts_resume); pixcir_i2c_ts_suspend, pixcir_i2c_ts_resume);
......
drivers/input/touchscreen/st1232.c
View file @ 02b6a58b
...@@ -243,8 +243,7 @@ static int st1232_ts_remove(struct i2c_client *client) ...@@ -243,8 +243,7 @@ static int st1232_ts_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused st1232_ts_suspend(struct device *dev)
static int st1232_ts_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct st1232_ts_data *ts = i2c_get_clientdata(client); struct st1232_ts_data *ts = i2c_get_clientdata(client);
...@@ -259,7 +258,7 @@ static int st1232_ts_suspend(struct device *dev) ...@@ -259,7 +258,7 @@ static int st1232_ts_suspend(struct device *dev)
return 0; return 0;
} }
static int st1232_ts_resume(struct device *dev) static int __maybe_unused st1232_ts_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct st1232_ts_data *ts = i2c_get_clientdata(client); struct st1232_ts_data *ts = i2c_get_clientdata(client);
...@@ -274,8 +273,6 @@ static int st1232_ts_resume(struct device *dev) ...@@ -274,8 +273,6 @@ static int st1232_ts_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(st1232_ts_pm_ops, static SIMPLE_DEV_PM_OPS(st1232_ts_pm_ops,
st1232_ts_suspend, st1232_ts_resume); st1232_ts_suspend, st1232_ts_resume);
......
drivers/input/touchscreen/tsc2005.c
View file @ 02b6a58b
...@@ -773,8 +773,7 @@ static int tsc2005_remove(struct spi_device *spi) ...@@ -773,8 +773,7 @@ static int tsc2005_remove(struct spi_device *spi)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused tsc2005_suspend(struct device *dev)
static int tsc2005_suspend(struct device *dev)
{ {
struct spi_device *spi = to_spi_device(dev); struct spi_device *spi = to_spi_device(dev);
struct tsc2005 *ts = spi_get_drvdata(spi); struct tsc2005 *ts = spi_get_drvdata(spi);
...@@ -791,7 +790,7 @@ static int tsc2005_suspend(struct device *dev) ...@@ -791,7 +790,7 @@ static int tsc2005_suspend(struct device *dev)
return 0; return 0;
} }
static int tsc2005_resume(struct device *dev) static int __maybe_unused tsc2005_resume(struct device *dev)
{ {
struct spi_device *spi = to_spi_device(dev); struct spi_device *spi = to_spi_device(dev);
struct tsc2005 *ts = spi_get_drvdata(spi); struct tsc2005 *ts = spi_get_drvdata(spi);
...@@ -807,7 +806,6 @@ static int tsc2005_resume(struct device *dev) ...@@ -807,7 +806,6 @@ static int tsc2005_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(tsc2005_pm_ops, tsc2005_suspend, tsc2005_resume); static SIMPLE_DEV_PM_OPS(tsc2005_pm_ops, tsc2005_suspend, tsc2005_resume);
......
drivers/input/touchscreen/ucb1400_ts.c
View file @ 02b6a58b
...@@ -406,8 +406,7 @@ static int ucb1400_ts_remove(struct platform_device *pdev) ...@@ -406,8 +406,7 @@ static int ucb1400_ts_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused ucb1400_ts_suspend(struct device *dev)
static int ucb1400_ts_suspend(struct device *dev)
{ {
struct ucb1400_ts *ucb = dev_get_platdata(dev); struct ucb1400_ts *ucb = dev_get_platdata(dev);
struct input_dev *idev = ucb->ts_idev; struct input_dev *idev = ucb->ts_idev;
...@@ -421,7 +420,7 @@ static int ucb1400_ts_suspend(struct device *dev) ...@@ -421,7 +420,7 @@ static int ucb1400_ts_suspend(struct device *dev)
return 0; return 0;
} }
static int ucb1400_ts_resume(struct device *dev) static int __maybe_unused ucb1400_ts_resume(struct device *dev)
{ {
struct ucb1400_ts *ucb = dev_get_platdata(dev); struct ucb1400_ts *ucb = dev_get_platdata(dev);
struct input_dev *idev = ucb->ts_idev; struct input_dev *idev = ucb->ts_idev;
...@@ -434,7 +433,6 @@ static int ucb1400_ts_resume(struct device *dev) ...@@ -434,7 +433,6 @@ static int ucb1400_ts_resume(struct device *dev)
mutex_unlock(&idev->mutex); mutex_unlock(&idev->mutex);
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops, static SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops,
ucb1400_ts_suspend, ucb1400_ts_resume); ucb1400_ts_suspend, ucb1400_ts_resume);
......
drivers/input/touchscreen/wacom_i2c.c
View file @ 02b6a58b
...@@ -242,8 +242,7 @@ static int wacom_i2c_remove(struct i2c_client *client) ...@@ -242,8 +242,7 @@ static int wacom_i2c_remove(struct i2c_client *client)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused wacom_i2c_suspend(struct device *dev)
static int wacom_i2c_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -252,7 +251,7 @@ static int wacom_i2c_suspend(struct device *dev) ...@@ -252,7 +251,7 @@ static int wacom_i2c_suspend(struct device *dev)
return 0; return 0;
} }
static int wacom_i2c_resume(struct device *dev) static int __maybe_unused wacom_i2c_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
...@@ -260,7 +259,6 @@ static int wacom_i2c_resume(struct device *dev) ...@@ -260,7 +259,6 @@ static int wacom_i2c_resume(struct device *dev)
return 0; return 0;
} }
#endif
static SIMPLE_DEV_PM_OPS(wacom_i2c_pm, wacom_i2c_suspend, wacom_i2c_resume); static SIMPLE_DEV_PM_OPS(wacom_i2c_pm, wacom_i2c_suspend, wacom_i2c_resume);
......
drivers/input/touchscreen/zforce_ts.c
View file @ 02b6a58b
...@@ -602,8 +602,7 @@ static void zforce_input_close(struct input_dev *dev) ...@@ -602,8 +602,7 @@ static void zforce_input_close(struct input_dev *dev)
return; return;
} }
#ifdef CONFIG_PM_SLEEP static int __maybe_unused zforce_suspend(struct device *dev)
static int zforce_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct zforce_ts *ts = i2c_get_clientdata(client); struct zforce_ts *ts = i2c_get_clientdata(client);
...@@ -648,7 +647,7 @@ static int zforce_suspend(struct device *dev) ...@@ -648,7 +647,7 @@ static int zforce_suspend(struct device *dev)
return ret; return ret;
} }
static int zforce_resume(struct device *dev) static int __maybe_unused zforce_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct zforce_ts *ts = i2c_get_clientdata(client); struct zforce_ts *ts = i2c_get_clientdata(client);
...@@ -685,7 +684,6 @@ static int zforce_resume(struct device *dev) ...@@ -685,7 +684,6 @@ static int zforce_resume(struct device *dev)
return ret; return ret;
} }
#endif
static SIMPLE_DEV_PM_OPS(zforce_pm_ops, zforce_suspend, zforce_resume); static SIMPLE_DEV_PM_OPS(zforce_pm_ops, zforce_suspend, zforce_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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7