diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2014-11-02 02:04:14 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-11-02 02:10:07 -0500 |
| commit | 02b6a58b83b2f3d97addaf96ef60ad6596bf715f (patch) | |
| tree | 4389eb074ceb36b9925e22e0c5dcb349e24fd503 /drivers | |
| parent | 572081a431196f15206c6314381af4829ae3382d (diff) | |
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: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/touchscreen/ad7877.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/ad7879.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/ads7846.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/auo-pixcir-ts.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/cy8ctmg110_ts.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/cyttsp_core.c | 7 | ||||
| -rw-r--r-- | drivers/input/touchscreen/edt-ft5x06.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/eeti_ts.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/egalax_ts.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/ili210x.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/ipaq-micro-ts.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/mms114.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/pixcir_i2c_ts.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/st1232.c | 7 | ||||
| -rw-r--r-- | drivers/input/touchscreen/tsc2005.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/ucb1400_ts.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/wacom_i2c.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/zforce_ts.c | 6 |
19 files changed, 38 insertions, 78 deletions
diff --git a/drivers/input/touchscreen/ad7877.c b/drivers/input/touchscreen/ad7877.c index 523865daa1d3..da4e5bb5e045 100644 --- a/drivers/input/touchscreen/ad7877.c +++ b/drivers/input/touchscreen/ad7877.c | |||
| @@ -820,8 +820,7 @@ static int ad7877_remove(struct spi_device *spi) | |||
| 820 | return 0; | 820 | return 0; |
| 821 | } | 821 | } |
| 822 | 822 | ||
| 823 | #ifdef CONFIG_PM_SLEEP | 823 | static int __maybe_unused ad7877_suspend(struct device *dev) |
| 824 | static int ad7877_suspend(struct device *dev) | ||
| 825 | { | 824 | { |
| 826 | struct ad7877 *ts = dev_get_drvdata(dev); | 825 | struct ad7877 *ts = dev_get_drvdata(dev); |
| 827 | 826 | ||
| @@ -830,7 +829,7 @@ static int ad7877_suspend(struct device *dev) | |||
| 830 | return 0; | 829 | return 0; |
| 831 | } | 830 | } |
| 832 | 831 | ||
| 833 | static int ad7877_resume(struct device *dev) | 832 | static int __maybe_unused ad7877_resume(struct device *dev) |
| 834 | { | 833 | { |
| 835 | struct ad7877 *ts = dev_get_drvdata(dev); | 834 | struct ad7877 *ts = dev_get_drvdata(dev); |
| 836 | 835 | ||
| @@ -838,7 +837,6 @@ static int ad7877_resume(struct device *dev) | |||
| 838 | 837 | ||
| 839 | return 0; | 838 | return 0; |
| 840 | } | 839 | } |
| 841 | #endif | ||
| 842 | 840 | ||
| 843 | static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume); | 841 | static SIMPLE_DEV_PM_OPS(ad7877_pm, ad7877_suspend, ad7877_resume); |
| 844 | 842 | ||
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c index fce590677b7b..927feec1e856 100644 --- a/drivers/input/touchscreen/ad7879.c +++ b/drivers/input/touchscreen/ad7879.c | |||
| @@ -284,8 +284,7 @@ static void ad7879_close(struct input_dev* input) | |||
| 284 | __ad7879_disable(ts); | 284 | __ad7879_disable(ts); |
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | #ifdef CONFIG_PM_SLEEP | 287 | static int __maybe_unused ad7879_suspend(struct device *dev) |
| 288 | static int ad7879_suspend(struct device *dev) | ||
| 289 | { | 288 | { |
| 290 | struct ad7879 *ts = dev_get_drvdata(dev); | 289 | struct ad7879 *ts = dev_get_drvdata(dev); |
| 291 | 290 | ||
| @@ -301,7 +300,7 @@ static int ad7879_suspend(struct device *dev) | |||
| 301 | return 0; | 300 | return 0; |
| 302 | } | 301 | } |
| 303 | 302 | ||
| 304 | static int ad7879_resume(struct device *dev) | 303 | static int __maybe_unused ad7879_resume(struct device *dev) |
| 305 | { | 304 | { |
| 306 | struct ad7879 *ts = dev_get_drvdata(dev); | 305 | struct ad7879 *ts = dev_get_drvdata(dev); |
| 307 | 306 | ||
| @@ -316,7 +315,6 @@ static int ad7879_resume(struct device *dev) | |||
| 316 | 315 | ||
| 317 | return 0; | 316 | return 0; |
| 318 | } | 317 | } |
| 319 | #endif | ||
| 320 | 318 | ||
| 321 | SIMPLE_DEV_PM_OPS(ad7879_pm_ops, ad7879_suspend, ad7879_resume); | 319 | SIMPLE_DEV_PM_OPS(ad7879_pm_ops, ad7879_suspend, ad7879_resume); |
| 322 | EXPORT_SYMBOL(ad7879_pm_ops); | 320 | EXPORT_SYMBOL(ad7879_pm_ops); |
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index e57ba52bf484..e4eb8a6c658f 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c | |||
| @@ -883,8 +883,7 @@ static irqreturn_t ads7846_irq(int irq, void *handle) | |||
| 883 | return IRQ_HANDLED; | 883 | return IRQ_HANDLED; |
| 884 | } | 884 | } |
| 885 | 885 | ||
| 886 | #ifdef CONFIG_PM_SLEEP | 886 | static int __maybe_unused ads7846_suspend(struct device *dev) |
| 887 | static int ads7846_suspend(struct device *dev) | ||
| 888 | { | 887 | { |
| 889 | struct ads7846 *ts = dev_get_drvdata(dev); | 888 | struct ads7846 *ts = dev_get_drvdata(dev); |
| 890 | 889 | ||
| @@ -906,7 +905,7 @@ static int ads7846_suspend(struct device *dev) | |||
| 906 | return 0; | 905 | return 0; |
| 907 | } | 906 | } |
| 908 | 907 | ||
| 909 | static int ads7846_resume(struct device *dev) | 908 | static int __maybe_unused ads7846_resume(struct device *dev) |
| 910 | { | 909 | { |
| 911 | struct ads7846 *ts = dev_get_drvdata(dev); | 910 | struct ads7846 *ts = dev_get_drvdata(dev); |
| 912 | 911 | ||
| @@ -927,7 +926,6 @@ static int ads7846_resume(struct device *dev) | |||
| 927 | 926 | ||
| 928 | return 0; | 927 | return 0; |
| 929 | } | 928 | } |
| 930 | #endif | ||
| 931 | 929 | ||
| 932 | static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume); | 930 | static SIMPLE_DEV_PM_OPS(ads7846_pm, ads7846_suspend, ads7846_resume); |
| 933 | 931 | ||
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index aaacf8bfa61f..bb070206223c 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c | |||
| @@ -2244,8 +2244,7 @@ static int mxt_remove(struct i2c_client *client) | |||
| 2244 | return 0; | 2244 | return 0; |
| 2245 | } | 2245 | } |
| 2246 | 2246 | ||
| 2247 | #ifdef CONFIG_PM_SLEEP | 2247 | static int __maybe_unused mxt_suspend(struct device *dev) |
| 2248 | static int mxt_suspend(struct device *dev) | ||
| 2249 | { | 2248 | { |
| 2250 | struct i2c_client *client = to_i2c_client(dev); | 2249 | struct i2c_client *client = to_i2c_client(dev); |
| 2251 | struct mxt_data *data = i2c_get_clientdata(client); | 2250 | struct mxt_data *data = i2c_get_clientdata(client); |
| @@ -2261,7 +2260,7 @@ static int mxt_suspend(struct device *dev) | |||
| 2261 | return 0; | 2260 | return 0; |
| 2262 | } | 2261 | } |
| 2263 | 2262 | ||
| 2264 | static int mxt_resume(struct device *dev) | 2263 | static int __maybe_unused mxt_resume(struct device *dev) |
| 2265 | { | 2264 | { |
| 2266 | struct i2c_client *client = to_i2c_client(dev); | 2265 | struct i2c_client *client = to_i2c_client(dev); |
| 2267 | struct mxt_data *data = i2c_get_clientdata(client); | 2266 | struct mxt_data *data = i2c_get_clientdata(client); |
| @@ -2276,7 +2275,6 @@ static int mxt_resume(struct device *dev) | |||
| 2276 | 2275 | ||
| 2277 | return 0; | 2276 | return 0; |
| 2278 | } | 2277 | } |
| 2279 | #endif | ||
| 2280 | 2278 | ||
| 2281 | static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume); | 2279 | static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume); |
| 2282 | 2280 | ||
diff --git a/drivers/input/touchscreen/auo-pixcir-ts.c b/drivers/input/touchscreen/auo-pixcir-ts.c index 7f3c94787787..40e02dd5b2f9 100644 --- a/drivers/input/touchscreen/auo-pixcir-ts.c +++ b/drivers/input/touchscreen/auo-pixcir-ts.c | |||
| @@ -417,8 +417,7 @@ static void auo_pixcir_input_close(struct input_dev *dev) | |||
| 417 | return; | 417 | return; |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | #ifdef CONFIG_PM_SLEEP | 420 | static int __maybe_unused auo_pixcir_suspend(struct device *dev) |
| 421 | static int auo_pixcir_suspend(struct device *dev) | ||
| 422 | { | 421 | { |
| 423 | struct i2c_client *client = to_i2c_client(dev); | 422 | struct i2c_client *client = to_i2c_client(dev); |
| 424 | struct auo_pixcir_ts *ts = i2c_get_clientdata(client); | 423 | struct auo_pixcir_ts *ts = i2c_get_clientdata(client); |
| @@ -450,7 +449,7 @@ unlock: | |||
| 450 | return ret; | 449 | return ret; |
| 451 | } | 450 | } |
| 452 | 451 | ||
| 453 | static int auo_pixcir_resume(struct device *dev) | 452 | static int __maybe_unused auo_pixcir_resume(struct device *dev) |
| 454 | { | 453 | { |
| 455 | struct i2c_client *client = to_i2c_client(dev); | 454 | struct i2c_client *client = to_i2c_client(dev); |
| 456 | struct auo_pixcir_ts *ts = i2c_get_clientdata(client); | 455 | struct auo_pixcir_ts *ts = i2c_get_clientdata(client); |
| @@ -479,7 +478,6 @@ unlock: | |||
| 479 | 478 | ||
| 480 | return ret; | 479 | return ret; |
| 481 | } | 480 | } |
| 482 | #endif | ||
| 483 | 481 | ||
| 484 | static SIMPLE_DEV_PM_OPS(auo_pixcir_pm_ops, | 482 | static SIMPLE_DEV_PM_OPS(auo_pixcir_pm_ops, |
| 485 | auo_pixcir_suspend, auo_pixcir_resume); | 483 | auo_pixcir_suspend, auo_pixcir_resume); |
diff --git a/drivers/input/touchscreen/cy8ctmg110_ts.c b/drivers/input/touchscreen/cy8ctmg110_ts.c index 5bf1aeeea825..f2119ee0e21b 100644 --- a/drivers/input/touchscreen/cy8ctmg110_ts.c +++ b/drivers/input/touchscreen/cy8ctmg110_ts.c | |||
| @@ -291,8 +291,7 @@ err_free_mem: | |||
| 291 | return err; | 291 | return err; |
| 292 | } | 292 | } |
| 293 | 293 | ||
| 294 | #ifdef CONFIG_PM_SLEEP | 294 | static int __maybe_unused cy8ctmg110_suspend(struct device *dev) |
| 295 | static int cy8ctmg110_suspend(struct device *dev) | ||
| 296 | { | 295 | { |
| 297 | struct i2c_client *client = to_i2c_client(dev); | 296 | struct i2c_client *client = to_i2c_client(dev); |
| 298 | struct cy8ctmg110 *ts = i2c_get_clientdata(client); | 297 | struct cy8ctmg110 *ts = i2c_get_clientdata(client); |
| @@ -306,7 +305,7 @@ static int cy8ctmg110_suspend(struct device *dev) | |||
| 306 | return 0; | 305 | return 0; |
| 307 | } | 306 | } |
| 308 | 307 | ||
| 309 | static int cy8ctmg110_resume(struct device *dev) | 308 | static int __maybe_unused cy8ctmg110_resume(struct device *dev) |
| 310 | { | 309 | { |
| 311 | struct i2c_client *client = to_i2c_client(dev); | 310 | struct i2c_client *client = to_i2c_client(dev); |
| 312 | struct cy8ctmg110 *ts = i2c_get_clientdata(client); | 311 | struct cy8ctmg110 *ts = i2c_get_clientdata(client); |
| @@ -319,7 +318,6 @@ static int cy8ctmg110_resume(struct device *dev) | |||
| 319 | } | 318 | } |
| 320 | return 0; | 319 | return 0; |
| 321 | } | 320 | } |
| 322 | #endif | ||
| 323 | 321 | ||
| 324 | static SIMPLE_DEV_PM_OPS(cy8ctmg110_pm, cy8ctmg110_suspend, cy8ctmg110_resume); | 322 | static SIMPLE_DEV_PM_OPS(cy8ctmg110_pm, cy8ctmg110_suspend, cy8ctmg110_resume); |
| 325 | 323 | ||
diff --git a/drivers/input/touchscreen/cyttsp_core.c b/drivers/input/touchscreen/cyttsp_core.c index eee656f77a2e..5b74e8b84e79 100644 --- a/drivers/input/touchscreen/cyttsp_core.c +++ b/drivers/input/touchscreen/cyttsp_core.c | |||
| @@ -472,8 +472,7 @@ static int cyttsp_disable(struct cyttsp *ts) | |||
| 472 | return 0; | 472 | return 0; |
| 473 | } | 473 | } |
| 474 | 474 | ||
| 475 | #ifdef CONFIG_PM_SLEEP | 475 | static int __maybe_unused cyttsp_suspend(struct device *dev) |
| 476 | static int cyttsp_suspend(struct device *dev) | ||
| 477 | { | 476 | { |
| 478 | struct cyttsp *ts = dev_get_drvdata(dev); | 477 | struct cyttsp *ts = dev_get_drvdata(dev); |
| 479 | int retval = 0; | 478 | int retval = 0; |
| @@ -491,7 +490,7 @@ static int cyttsp_suspend(struct device *dev) | |||
| 491 | return retval; | 490 | return retval; |
| 492 | } | 491 | } |
| 493 | 492 | ||
| 494 | static int cyttsp_resume(struct device *dev) | 493 | static int __maybe_unused cyttsp_resume(struct device *dev) |
| 495 | { | 494 | { |
| 496 | struct cyttsp *ts = dev_get_drvdata(dev); | 495 | struct cyttsp *ts = dev_get_drvdata(dev); |
| 497 | 496 | ||
| @@ -507,8 +506,6 @@ static int cyttsp_resume(struct device *dev) | |||
| 507 | return 0; | 506 | return 0; |
| 508 | } | 507 | } |
| 509 | 508 | ||
| 510 | #endif | ||
| 511 | |||
| 512 | SIMPLE_DEV_PM_OPS(cyttsp_pm_ops, cyttsp_suspend, cyttsp_resume); | 509 | SIMPLE_DEV_PM_OPS(cyttsp_pm_ops, cyttsp_suspend, cyttsp_resume); |
| 513 | EXPORT_SYMBOL_GPL(cyttsp_pm_ops); | 510 | EXPORT_SYMBOL_GPL(cyttsp_pm_ops); |
| 514 | 511 | ||
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c index 8857d5b9be71..2e4d90919f4b 100644 --- a/drivers/input/touchscreen/edt-ft5x06.c +++ b/drivers/input/touchscreen/edt-ft5x06.c | |||
| @@ -1092,8 +1092,7 @@ static int edt_ft5x06_ts_remove(struct i2c_client *client) | |||
| 1092 | return 0; | 1092 | return 0; |
| 1093 | } | 1093 | } |
| 1094 | 1094 | ||
| 1095 | #ifdef CONFIG_PM_SLEEP | 1095 | static int __maybe_unused edt_ft5x06_ts_suspend(struct device *dev) |
| 1096 | static int edt_ft5x06_ts_suspend(struct device *dev) | ||
| 1097 | { | 1096 | { |
| 1098 | struct i2c_client *client = to_i2c_client(dev); | 1097 | struct i2c_client *client = to_i2c_client(dev); |
| 1099 | 1098 | ||
| @@ -1103,7 +1102,7 @@ static int edt_ft5x06_ts_suspend(struct device *dev) | |||
| 1103 | return 0; | 1102 | return 0; |
| 1104 | } | 1103 | } |
| 1105 | 1104 | ||
| 1106 | static int edt_ft5x06_ts_resume(struct device *dev) | 1105 | static int __maybe_unused edt_ft5x06_ts_resume(struct device *dev) |
| 1107 | { | 1106 | { |
| 1108 | struct i2c_client *client = to_i2c_client(dev); | 1107 | struct i2c_client *client = to_i2c_client(dev); |
| 1109 | 1108 | ||
| @@ -1112,7 +1111,6 @@ static int edt_ft5x06_ts_resume(struct device *dev) | |||
| 1112 | 1111 | ||
| 1113 | return 0; | 1112 | return 0; |
| 1114 | } | 1113 | } |
| 1115 | #endif | ||
| 1116 | 1114 | ||
| 1117 | static SIMPLE_DEV_PM_OPS(edt_ft5x06_ts_pm_ops, | 1115 | static SIMPLE_DEV_PM_OPS(edt_ft5x06_ts_pm_ops, |
| 1118 | edt_ft5x06_ts_suspend, edt_ft5x06_ts_resume); | 1116 | edt_ft5x06_ts_suspend, edt_ft5x06_ts_resume); |
diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c index b1884ddd7a84..09be6ced7151 100644 --- a/drivers/input/touchscreen/eeti_ts.c +++ b/drivers/input/touchscreen/eeti_ts.c | |||
| @@ -264,8 +264,7 @@ static int eeti_ts_remove(struct i2c_client *client) | |||
| 264 | return 0; | 264 | return 0; |
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | #ifdef CONFIG_PM_SLEEP | 267 | static int __maybe_unused eeti_ts_suspend(struct device *dev) |
| 268 | static int eeti_ts_suspend(struct device *dev) | ||
| 269 | { | 268 | { |
| 270 | struct i2c_client *client = to_i2c_client(dev); | 269 | struct i2c_client *client = to_i2c_client(dev); |
| 271 | struct eeti_ts_priv *priv = i2c_get_clientdata(client); | 270 | struct eeti_ts_priv *priv = i2c_get_clientdata(client); |
| @@ -284,7 +283,7 @@ static int eeti_ts_suspend(struct device *dev) | |||
| 284 | return 0; | 283 | return 0; |
| 285 | } | 284 | } |
| 286 | 285 | ||
| 287 | static int eeti_ts_resume(struct device *dev) | 286 | static int __maybe_unused eeti_ts_resume(struct device *dev) |
| 288 | { | 287 | { |
| 289 | struct i2c_client *client = to_i2c_client(dev); | 288 | struct i2c_client *client = to_i2c_client(dev); |
| 290 | struct eeti_ts_priv *priv = i2c_get_clientdata(client); | 289 | struct eeti_ts_priv *priv = i2c_get_clientdata(client); |
| @@ -302,7 +301,6 @@ static int eeti_ts_resume(struct device *dev) | |||
| 302 | 301 | ||
| 303 | return 0; | 302 | return 0; |
| 304 | } | 303 | } |
| 305 | #endif | ||
| 306 | 304 | ||
| 307 | static SIMPLE_DEV_PM_OPS(eeti_ts_pm, eeti_ts_suspend, eeti_ts_resume); | 305 | static SIMPLE_DEV_PM_OPS(eeti_ts_pm, eeti_ts_suspend, eeti_ts_resume); |
| 308 | 306 | ||
diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c index c8057847d71d..4c56299284ef 100644 --- a/drivers/input/touchscreen/egalax_ts.c +++ b/drivers/input/touchscreen/egalax_ts.c | |||
| @@ -239,8 +239,7 @@ static const struct i2c_device_id egalax_ts_id[] = { | |||
| 239 | }; | 239 | }; |
| 240 | MODULE_DEVICE_TABLE(i2c, egalax_ts_id); | 240 | MODULE_DEVICE_TABLE(i2c, egalax_ts_id); |
| 241 | 241 | ||
| 242 | #ifdef CONFIG_PM_SLEEP | 242 | static int __maybe_unused egalax_ts_suspend(struct device *dev) |
| 243 | static int egalax_ts_suspend(struct device *dev) | ||
| 244 | { | 243 | { |
| 245 | static const u8 suspend_cmd[MAX_I2C_DATA_LEN] = { | 244 | static const u8 suspend_cmd[MAX_I2C_DATA_LEN] = { |
| 246 | 0x3, 0x6, 0xa, 0x3, 0x36, 0x3f, 0x2, 0, 0, 0 | 245 | 0x3, 0x6, 0xa, 0x3, 0x36, 0x3f, 0x2, 0, 0, 0 |
| @@ -252,13 +251,12 @@ static int egalax_ts_suspend(struct device *dev) | |||
| 252 | return ret > 0 ? 0 : ret; | 251 | return ret > 0 ? 0 : ret; |
| 253 | } | 252 | } |
| 254 | 253 | ||
| 255 | static int egalax_ts_resume(struct device *dev) | 254 | static int __maybe_unused egalax_ts_resume(struct device *dev) |
| 256 | { | 255 | { |
| 257 | struct i2c_client *client = to_i2c_client(dev); | 256 | struct i2c_client *client = to_i2c_client(dev); |
| 258 | 257 | ||
| 259 | return egalax_wake_up_device(client); | 258 | return egalax_wake_up_device(client); |
| 260 | } | 259 | } |
| 261 | #endif | ||
| 262 | 260 | ||
| 263 | static SIMPLE_DEV_PM_OPS(egalax_ts_pm_ops, egalax_ts_suspend, egalax_ts_resume); | 261 | static SIMPLE_DEV_PM_OPS(egalax_ts_pm_ops, egalax_ts_suspend, egalax_ts_resume); |
| 264 | 262 | ||
diff --git a/drivers/input/touchscreen/ili210x.c b/drivers/input/touchscreen/ili210x.c index 2a5089139818..da6dc819c846 100644 --- a/drivers/input/touchscreen/ili210x.c +++ b/drivers/input/touchscreen/ili210x.c | |||
| @@ -311,8 +311,7 @@ static int ili210x_i2c_remove(struct i2c_client *client) | |||
| 311 | return 0; | 311 | return 0; |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | #ifdef CONFIG_PM_SLEEP | 314 | static int __maybe_unused ili210x_i2c_suspend(struct device *dev) |
| 315 | static int ili210x_i2c_suspend(struct device *dev) | ||
| 316 | { | 315 | { |
| 317 | struct i2c_client *client = to_i2c_client(dev); | 316 | struct i2c_client *client = to_i2c_client(dev); |
| 318 | 317 | ||
| @@ -322,7 +321,7 @@ static int ili210x_i2c_suspend(struct device *dev) | |||
| 322 | return 0; | 321 | return 0; |
| 323 | } | 322 | } |
| 324 | 323 | ||
| 325 | static int ili210x_i2c_resume(struct device *dev) | 324 | static int __maybe_unused ili210x_i2c_resume(struct device *dev) |
| 326 | { | 325 | { |
| 327 | struct i2c_client *client = to_i2c_client(dev); | 326 | struct i2c_client *client = to_i2c_client(dev); |
| 328 | 327 | ||
| @@ -331,7 +330,6 @@ static int ili210x_i2c_resume(struct device *dev) | |||
| 331 | 330 | ||
| 332 | return 0; | 331 | return 0; |
| 333 | } | 332 | } |
| 334 | #endif | ||
| 335 | 333 | ||
| 336 | static SIMPLE_DEV_PM_OPS(ili210x_i2c_pm, | 334 | static SIMPLE_DEV_PM_OPS(ili210x_i2c_pm, |
| 337 | ili210x_i2c_suspend, ili210x_i2c_resume); | 335 | ili210x_i2c_suspend, ili210x_i2c_resume); |
diff --git a/drivers/input/touchscreen/ipaq-micro-ts.c b/drivers/input/touchscreen/ipaq-micro-ts.c index 62c8976e616f..33c134820ef9 100644 --- a/drivers/input/touchscreen/ipaq-micro-ts.c +++ b/drivers/input/touchscreen/ipaq-micro-ts.c | |||
| @@ -122,8 +122,7 @@ static int micro_ts_probe(struct platform_device *pdev) | |||
| 122 | return 0; | 122 | return 0; |
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | #ifdef CONFIG_PM_SLEEP | 125 | static int __maybe_unused micro_ts_suspend(struct device *dev) |
| 126 | static int micro_ts_suspend(struct device *dev) | ||
| 127 | { | 126 | { |
| 128 | struct touchscreen_data *ts = dev_get_drvdata(dev); | 127 | struct touchscreen_data *ts = dev_get_drvdata(dev); |
| 129 | 128 | ||
| @@ -132,7 +131,7 @@ static int micro_ts_suspend(struct device *dev) | |||
| 132 | return 0; | 131 | return 0; |
| 133 | } | 132 | } |
| 134 | 133 | ||
| 135 | static int micro_ts_resume(struct device *dev) | 134 | static int __maybe_unused micro_ts_resume(struct device *dev) |
| 136 | { | 135 | { |
| 137 | struct touchscreen_data *ts = dev_get_drvdata(dev); | 136 | struct touchscreen_data *ts = dev_get_drvdata(dev); |
| 138 | struct input_dev *input = ts->input; | 137 | struct input_dev *input = ts->input; |
| @@ -146,7 +145,6 @@ static int micro_ts_resume(struct device *dev) | |||
| 146 | 145 | ||
| 147 | return 0; | 146 | return 0; |
| 148 | } | 147 | } |
| 149 | #endif | ||
| 150 | 148 | ||
| 151 | static const struct dev_pm_ops micro_ts_dev_pm_ops = { | 149 | static const struct dev_pm_ops micro_ts_dev_pm_ops = { |
| 152 | SET_SYSTEM_SLEEP_PM_OPS(micro_ts_suspend, micro_ts_resume) | 150 | SET_SYSTEM_SLEEP_PM_OPS(micro_ts_suspend, micro_ts_resume) |
diff --git a/drivers/input/touchscreen/mms114.c b/drivers/input/touchscreen/mms114.c index 372bbf7658fe..67c0d31613d8 100644 --- a/drivers/input/touchscreen/mms114.c +++ b/drivers/input/touchscreen/mms114.c | |||
| @@ -515,8 +515,7 @@ static int mms114_probe(struct i2c_client *client, | |||
| 515 | return 0; | 515 | return 0; |
| 516 | } | 516 | } |
| 517 | 517 | ||
| 518 | #ifdef CONFIG_PM_SLEEP | 518 | static int __maybe_unused mms114_suspend(struct device *dev) |
| 519 | static int mms114_suspend(struct device *dev) | ||
| 520 | { | 519 | { |
| 521 | struct i2c_client *client = to_i2c_client(dev); | 520 | struct i2c_client *client = to_i2c_client(dev); |
| 522 | struct mms114_data *data = i2c_get_clientdata(client); | 521 | struct mms114_data *data = i2c_get_clientdata(client); |
| @@ -540,7 +539,7 @@ static int mms114_suspend(struct device *dev) | |||
| 540 | return 0; | 539 | return 0; |
| 541 | } | 540 | } |
| 542 | 541 | ||
| 543 | static int mms114_resume(struct device *dev) | 542 | static int __maybe_unused mms114_resume(struct device *dev) |
| 544 | { | 543 | { |
| 545 | struct i2c_client *client = to_i2c_client(dev); | 544 | struct i2c_client *client = to_i2c_client(dev); |
| 546 | struct mms114_data *data = i2c_get_clientdata(client); | 545 | struct mms114_data *data = i2c_get_clientdata(client); |
| @@ -559,7 +558,6 @@ static int mms114_resume(struct device *dev) | |||
| 559 | 558 | ||
| 560 | return 0; | 559 | return 0; |
| 561 | } | 560 | } |
| 562 | #endif | ||
| 563 | 561 | ||
| 564 | static SIMPLE_DEV_PM_OPS(mms114_pm_ops, mms114_suspend, mms114_resume); | 562 | static SIMPLE_DEV_PM_OPS(mms114_pm_ops, mms114_suspend, mms114_resume); |
| 565 | 563 | ||
diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c index fc49c75317d1..4fb5537fdd42 100644 --- a/drivers/input/touchscreen/pixcir_i2c_ts.c +++ b/drivers/input/touchscreen/pixcir_i2c_ts.c | |||
| @@ -347,8 +347,7 @@ static void pixcir_input_close(struct input_dev *dev) | |||
| 347 | pixcir_stop(ts); | 347 | pixcir_stop(ts); |
| 348 | } | 348 | } |
| 349 | 349 | ||
| 350 | #ifdef CONFIG_PM_SLEEP | 350 | static int __maybe_unused pixcir_i2c_ts_suspend(struct device *dev) |
| 351 | static int pixcir_i2c_ts_suspend(struct device *dev) | ||
| 352 | { | 351 | { |
| 353 | struct i2c_client *client = to_i2c_client(dev); | 352 | struct i2c_client *client = to_i2c_client(dev); |
| 354 | struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client); | 353 | struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client); |
| @@ -377,7 +376,7 @@ unlock: | |||
| 377 | return ret; | 376 | return ret; |
| 378 | } | 377 | } |
| 379 | 378 | ||
| 380 | static int pixcir_i2c_ts_resume(struct device *dev) | 379 | static int __maybe_unused pixcir_i2c_ts_resume(struct device *dev) |
| 381 | { | 380 | { |
| 382 | struct i2c_client *client = to_i2c_client(dev); | 381 | struct i2c_client *client = to_i2c_client(dev); |
| 383 | struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client); | 382 | struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client); |
| @@ -405,7 +404,6 @@ unlock: | |||
| 405 | 404 | ||
| 406 | return ret; | 405 | return ret; |
| 407 | } | 406 | } |
| 408 | #endif | ||
| 409 | 407 | ||
| 410 | static SIMPLE_DEV_PM_OPS(pixcir_dev_pm_ops, | 408 | static SIMPLE_DEV_PM_OPS(pixcir_dev_pm_ops, |
| 411 | pixcir_i2c_ts_suspend, pixcir_i2c_ts_resume); | 409 | pixcir_i2c_ts_suspend, pixcir_i2c_ts_resume); |
diff --git a/drivers/input/touchscreen/st1232.c b/drivers/input/touchscreen/st1232.c index 3c0f57efe7b1..697e26e52d54 100644 --- a/drivers/input/touchscreen/st1232.c +++ b/drivers/input/touchscreen/st1232.c | |||
| @@ -243,8 +243,7 @@ static int st1232_ts_remove(struct i2c_client *client) | |||
| 243 | return 0; | 243 | return 0; |
| 244 | } | 244 | } |
| 245 | 245 | ||
| 246 | #ifdef CONFIG_PM_SLEEP | 246 | static int __maybe_unused st1232_ts_suspend(struct device *dev) |
| 247 | static int st1232_ts_suspend(struct device *dev) | ||
| 248 | { | 247 | { |
| 249 | struct i2c_client *client = to_i2c_client(dev); | 248 | struct i2c_client *client = to_i2c_client(dev); |
| 250 | struct st1232_ts_data *ts = i2c_get_clientdata(client); | 249 | struct st1232_ts_data *ts = i2c_get_clientdata(client); |
| @@ -259,7 +258,7 @@ static int st1232_ts_suspend(struct device *dev) | |||
| 259 | return 0; | 258 | return 0; |
| 260 | } | 259 | } |
| 261 | 260 | ||
| 262 | static int st1232_ts_resume(struct device *dev) | 261 | static int __maybe_unused st1232_ts_resume(struct device *dev) |
| 263 | { | 262 | { |
| 264 | struct i2c_client *client = to_i2c_client(dev); | 263 | struct i2c_client *client = to_i2c_client(dev); |
| 265 | struct st1232_ts_data *ts = i2c_get_clientdata(client); | 264 | struct st1232_ts_data *ts = i2c_get_clientdata(client); |
| @@ -274,8 +273,6 @@ static int st1232_ts_resume(struct device *dev) | |||
| 274 | return 0; | 273 | return 0; |
| 275 | } | 274 | } |
| 276 | 275 | ||
| 277 | #endif | ||
| 278 | |||
| 279 | static SIMPLE_DEV_PM_OPS(st1232_ts_pm_ops, | 276 | static SIMPLE_DEV_PM_OPS(st1232_ts_pm_ops, |
| 280 | st1232_ts_suspend, st1232_ts_resume); | 277 | st1232_ts_suspend, st1232_ts_resume); |
| 281 | 278 | ||
diff --git a/drivers/input/touchscreen/tsc2005.c b/drivers/input/touchscreen/tsc2005.c index 52380b68ebdf..72657c579430 100644 --- a/drivers/input/touchscreen/tsc2005.c +++ b/drivers/input/touchscreen/tsc2005.c | |||
| @@ -773,8 +773,7 @@ static int tsc2005_remove(struct spi_device *spi) | |||
| 773 | return 0; | 773 | return 0; |
| 774 | } | 774 | } |
| 775 | 775 | ||
| 776 | #ifdef CONFIG_PM_SLEEP | 776 | static int __maybe_unused tsc2005_suspend(struct device *dev) |
| 777 | static int tsc2005_suspend(struct device *dev) | ||
| 778 | { | 777 | { |
| 779 | struct spi_device *spi = to_spi_device(dev); | 778 | struct spi_device *spi = to_spi_device(dev); |
| 780 | struct tsc2005 *ts = spi_get_drvdata(spi); | 779 | struct tsc2005 *ts = spi_get_drvdata(spi); |
| @@ -791,7 +790,7 @@ static int tsc2005_suspend(struct device *dev) | |||
| 791 | return 0; | 790 | return 0; |
| 792 | } | 791 | } |
| 793 | 792 | ||
| 794 | static int tsc2005_resume(struct device *dev) | 793 | static int __maybe_unused tsc2005_resume(struct device *dev) |
| 795 | { | 794 | { |
| 796 | struct spi_device *spi = to_spi_device(dev); | 795 | struct spi_device *spi = to_spi_device(dev); |
| 797 | struct tsc2005 *ts = spi_get_drvdata(spi); | 796 | struct tsc2005 *ts = spi_get_drvdata(spi); |
| @@ -807,7 +806,6 @@ static int tsc2005_resume(struct device *dev) | |||
| 807 | 806 | ||
| 808 | return 0; | 807 | return 0; |
| 809 | } | 808 | } |
| 810 | #endif | ||
| 811 | 809 | ||
| 812 | static SIMPLE_DEV_PM_OPS(tsc2005_pm_ops, tsc2005_suspend, tsc2005_resume); | 810 | static SIMPLE_DEV_PM_OPS(tsc2005_pm_ops, tsc2005_suspend, tsc2005_resume); |
| 813 | 811 | ||
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index b46c55cd1bbb..bf132c45af1a 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c | |||
| @@ -406,8 +406,7 @@ static int ucb1400_ts_remove(struct platform_device *pdev) | |||
| 406 | return 0; | 406 | return 0; |
| 407 | } | 407 | } |
| 408 | 408 | ||
| 409 | #ifdef CONFIG_PM_SLEEP | 409 | static int __maybe_unused ucb1400_ts_suspend(struct device *dev) |
| 410 | static int ucb1400_ts_suspend(struct device *dev) | ||
| 411 | { | 410 | { |
| 412 | struct ucb1400_ts *ucb = dev_get_platdata(dev); | 411 | struct ucb1400_ts *ucb = dev_get_platdata(dev); |
| 413 | struct input_dev *idev = ucb->ts_idev; | 412 | struct input_dev *idev = ucb->ts_idev; |
| @@ -421,7 +420,7 @@ static int ucb1400_ts_suspend(struct device *dev) | |||
| 421 | return 0; | 420 | return 0; |
| 422 | } | 421 | } |
| 423 | 422 | ||
| 424 | static int ucb1400_ts_resume(struct device *dev) | 423 | static int __maybe_unused ucb1400_ts_resume(struct device *dev) |
| 425 | { | 424 | { |
| 426 | struct ucb1400_ts *ucb = dev_get_platdata(dev); | 425 | struct ucb1400_ts *ucb = dev_get_platdata(dev); |
| 427 | struct input_dev *idev = ucb->ts_idev; | 426 | struct input_dev *idev = ucb->ts_idev; |
| @@ -434,7 +433,6 @@ static int ucb1400_ts_resume(struct device *dev) | |||
| 434 | mutex_unlock(&idev->mutex); | 433 | mutex_unlock(&idev->mutex); |
| 435 | return 0; | 434 | return 0; |
| 436 | } | 435 | } |
| 437 | #endif | ||
| 438 | 436 | ||
| 439 | static SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops, | 437 | static SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops, |
| 440 | ucb1400_ts_suspend, ucb1400_ts_resume); | 438 | ucb1400_ts_suspend, ucb1400_ts_resume); |
diff --git a/drivers/input/touchscreen/wacom_i2c.c b/drivers/input/touchscreen/wacom_i2c.c index 7ccaa1b12b05..32f8ac003936 100644 --- a/drivers/input/touchscreen/wacom_i2c.c +++ b/drivers/input/touchscreen/wacom_i2c.c | |||
| @@ -242,8 +242,7 @@ static int wacom_i2c_remove(struct i2c_client *client) | |||
| 242 | return 0; | 242 | return 0; |
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | #ifdef CONFIG_PM_SLEEP | 245 | static int __maybe_unused wacom_i2c_suspend(struct device *dev) |
| 246 | static int wacom_i2c_suspend(struct device *dev) | ||
| 247 | { | 246 | { |
| 248 | struct i2c_client *client = to_i2c_client(dev); | 247 | struct i2c_client *client = to_i2c_client(dev); |
| 249 | 248 | ||
| @@ -252,7 +251,7 @@ static int wacom_i2c_suspend(struct device *dev) | |||
| 252 | return 0; | 251 | return 0; |
| 253 | } | 252 | } |
| 254 | 253 | ||
| 255 | static int wacom_i2c_resume(struct device *dev) | 254 | static int __maybe_unused wacom_i2c_resume(struct device *dev) |
| 256 | { | 255 | { |
| 257 | struct i2c_client *client = to_i2c_client(dev); | 256 | struct i2c_client *client = to_i2c_client(dev); |
| 258 | 257 | ||
| @@ -260,7 +259,6 @@ static int wacom_i2c_resume(struct device *dev) | |||
| 260 | 259 | ||
| 261 | return 0; | 260 | return 0; |
| 262 | } | 261 | } |
| 263 | #endif | ||
| 264 | 262 | ||
| 265 | static SIMPLE_DEV_PM_OPS(wacom_i2c_pm, wacom_i2c_suspend, wacom_i2c_resume); | 263 | static SIMPLE_DEV_PM_OPS(wacom_i2c_pm, wacom_i2c_suspend, wacom_i2c_resume); |
| 266 | 264 | ||
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c index 8ba48f5eff7b..19880c7385e3 100644 --- a/drivers/input/touchscreen/zforce_ts.c +++ b/drivers/input/touchscreen/zforce_ts.c | |||
| @@ -602,8 +602,7 @@ static void zforce_input_close(struct input_dev *dev) | |||
| 602 | return; | 602 | return; |
| 603 | } | 603 | } |
| 604 | 604 | ||
| 605 | #ifdef CONFIG_PM_SLEEP | 605 | static int __maybe_unused zforce_suspend(struct device *dev) |
| 606 | static int zforce_suspend(struct device *dev) | ||
| 607 | { | 606 | { |
| 608 | struct i2c_client *client = to_i2c_client(dev); | 607 | struct i2c_client *client = to_i2c_client(dev); |
| 609 | struct zforce_ts *ts = i2c_get_clientdata(client); | 608 | struct zforce_ts *ts = i2c_get_clientdata(client); |
| @@ -648,7 +647,7 @@ unlock: | |||
| 648 | return ret; | 647 | return ret; |
| 649 | } | 648 | } |
| 650 | 649 | ||
| 651 | static int zforce_resume(struct device *dev) | 650 | static int __maybe_unused zforce_resume(struct device *dev) |
| 652 | { | 651 | { |
| 653 | struct i2c_client *client = to_i2c_client(dev); | 652 | struct i2c_client *client = to_i2c_client(dev); |
| 654 | struct zforce_ts *ts = i2c_get_clientdata(client); | 653 | struct zforce_ts *ts = i2c_get_clientdata(client); |
| @@ -685,7 +684,6 @@ unlock: | |||
| 685 | 684 | ||
| 686 | return ret; | 685 | return ret; |
| 687 | } | 686 | } |
| 688 | #endif | ||
| 689 | 687 | ||
| 690 | static SIMPLE_DEV_PM_OPS(zforce_pm_ops, zforce_suspend, zforce_resume); | 688 | static SIMPLE_DEV_PM_OPS(zforce_pm_ops, zforce_suspend, zforce_resume); |
| 691 | 689 | ||
