aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/ad7879.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-11-14 03:32:09 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-11-16 01:24:22 -0500
commit8672bd93d3d67b18a2b067ece30dabcda11f8cde (patch)
treeba2987ce325f7a3d9b77730f19635bf5b6be0428 /drivers/input/touchscreen/ad7879.c
parent59bae1db71942dcf91bb7e4938989606095536b5 (diff)
Input: ad7879 - consolidate PM methods
The PM methods are basically the same for SPI and I2C busses, so let's use the same dev_pm_ops for both of them. Acked-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen/ad7879.c')
-rw-r--r--drivers/input/touchscreen/ad7879.c19
1 files changed, 15 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index 76f5cb4e6ea9..dce60b816b58 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -280,8 +280,11 @@ static void ad7879_close(struct input_dev* input)
280 __ad7879_disable(ts); 280 __ad7879_disable(ts);
281} 281}
282 282
283void ad7879_suspend(struct ad7879 *ts) 283#ifdef CONFIG_PM_SLEEP
284static int ad7879_suspend(struct device *dev)
284{ 285{
286 struct ad7879 *ts = dev_get_drvdata(dev);
287
285 mutex_lock(&ts->input->mutex); 288 mutex_lock(&ts->input->mutex);
286 289
287 if (!ts->suspended && !ts->disabled && ts->input->users) 290 if (!ts->suspended && !ts->disabled && ts->input->users)
@@ -290,11 +293,14 @@ void ad7879_suspend(struct ad7879 *ts)
290 ts->suspended = true; 293 ts->suspended = true;
291 294
292 mutex_unlock(&ts->input->mutex); 295 mutex_unlock(&ts->input->mutex);
296
297 return 0;
293} 298}
294EXPORT_SYMBOL(ad7879_suspend);
295 299
296void ad7879_resume(struct ad7879 *ts) 300static int ad7879_resume(struct device *dev)
297{ 301{
302 struct ad7879 *ts = dev_get_drvdata(dev);
303
298 mutex_lock(&ts->input->mutex); 304 mutex_lock(&ts->input->mutex);
299 305
300 if (ts->suspended && !ts->disabled && ts->input->users) 306 if (ts->suspended && !ts->disabled && ts->input->users)
@@ -303,8 +309,13 @@ void ad7879_resume(struct ad7879 *ts)
303 ts->suspended = false; 309 ts->suspended = false;
304 310
305 mutex_unlock(&ts->input->mutex); 311 mutex_unlock(&ts->input->mutex);
312
313 return 0;
306} 314}
307EXPORT_SYMBOL(ad7879_resume); 315#endif
316
317SIMPLE_DEV_PM_OPS(ad7879_pm_ops, ad7879_suspend, ad7879_resume);
318EXPORT_SYMBOL(ad7879_pm_ops);
308 319
309static void ad7879_toggle(struct ad7879 *ts, bool disable) 320static void ad7879_toggle(struct ad7879 *ts, bool disable)
310{ 321{