diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-15 23:32:42 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-12-15 23:32:42 -0500 |
| commit | f20c86cd75f1c8c728dafd0218645ff3c5e8545d (patch) | |
| tree | b9100463df79eeafbef87a0bbbaaba4740313120 /drivers/input/misc/max8997_haptic.c | |
| parent | a1f9a4072655843fc03186acbad65990cc05dd2d (diff) | |
| parent | 1d6a01365fd63fbf7c2709a183e2936728c8efad (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 3.19.
Diffstat (limited to 'drivers/input/misc/max8997_haptic.c')
| -rw-r--r-- | drivers/input/misc/max8997_haptic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c index a363ebbd9cc0..980437ac314d 100644 --- a/drivers/input/misc/max8997_haptic.c +++ b/drivers/input/misc/max8997_haptic.c | |||
| @@ -378,8 +378,7 @@ static int max8997_haptic_remove(struct platform_device *pdev) | |||
| 378 | return 0; | 378 | return 0; |
| 379 | } | 379 | } |
| 380 | 380 | ||
| 381 | #ifdef CONFIG_PM_SLEEP | 381 | static int __maybe_unused max8997_haptic_suspend(struct device *dev) |
| 382 | static int max8997_haptic_suspend(struct device *dev) | ||
| 383 | { | 382 | { |
| 384 | struct platform_device *pdev = to_platform_device(dev); | 383 | struct platform_device *pdev = to_platform_device(dev); |
| 385 | struct max8997_haptic *chip = platform_get_drvdata(pdev); | 384 | struct max8997_haptic *chip = platform_get_drvdata(pdev); |
| @@ -388,7 +387,6 @@ static int max8997_haptic_suspend(struct device *dev) | |||
| 388 | 387 | ||
| 389 | return 0; | 388 | return 0; |
| 390 | } | 389 | } |
| 391 | #endif | ||
| 392 | 390 | ||
| 393 | static SIMPLE_DEV_PM_OPS(max8997_haptic_pm_ops, max8997_haptic_suspend, NULL); | 391 | static SIMPLE_DEV_PM_OPS(max8997_haptic_pm_ops, max8997_haptic_suspend, NULL); |
| 394 | 392 | ||