projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[cascardo/linux.git]
/
drivers
/
input
/
misc
/
twl4030-vibra.c
diff --git
a/drivers/input/misc/twl4030-vibra.c
b/drivers/input/misc/twl4030-vibra.c
index
960ef2a
..
fc17b95
100644
(file)
--- a/
drivers/input/misc/twl4030-vibra.c
+++ b/
drivers/input/misc/twl4030-vibra.c
@@
-157,8
+157,7
@@
static void twl4030_vibra_close(struct input_dev *input)
}
/*** Module ***/
}
/*** Module ***/
-#ifdef CONFIG_PM_SLEEP
-static int twl4030_vibra_suspend(struct device *dev)
+static int __maybe_unused twl4030_vibra_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct vibra_info *info = platform_get_drvdata(pdev);
{
struct platform_device *pdev = to_platform_device(dev);
struct vibra_info *info = platform_get_drvdata(pdev);
@@
-169,12
+168,11
@@
static int twl4030_vibra_suspend(struct device *dev)
return 0;
}
return 0;
}
-static int twl4030_vibra_resume(struct device *dev)
+static int
__maybe_unused
twl4030_vibra_resume(struct device *dev)
{
vibra_disable_leds();
return 0;
}
{
vibra_disable_leds();
return 0;
}
-#endif
static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
twl4030_vibra_suspend, twl4030_vibra_resume);
static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops,
twl4030_vibra_suspend, twl4030_vibra_resume);
@@
-253,7
+251,6
@@
static struct platform_driver twl4030_vibra_driver = {
.probe = twl4030_vibra_probe,
.driver = {
.name = "twl4030-vibra",
.probe = twl4030_vibra_probe,
.driver = {
.name = "twl4030-vibra",
- .owner = THIS_MODULE,
.pm = &twl4030_vibra_pm_ops,
},
};
.pm = &twl4030_vibra_pm_ops,
},
};