Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[cascardo/linux.git] / drivers / input / misc / sirfsoc-onkey.c

diff --git a/drivers/input/misc/sirfsoc-onkey.c b/drivers/input/misc/sirfsoc-onkey.c
index fed5102..9d5b89b 100644 (file)
--- a/drivers/input/misc/sirfsoc-onkey.c
+++ b/drivers/input/misc/sirfsoc-onkey.c
@@ -179,8 +179,7 @@ static int sirfsoc_pwrc_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int sirfsoc_pwrc_resume(struct device *dev)
+static int __maybe_unused sirfsoc_pwrc_resume(struct device *dev)
 {
        struct sirfsoc_pwrc_drvdata *pwrcdrv = dev_get_drvdata(dev);
        struct input_dev *input = pwrcdrv->input;
@@ -196,7 +195,6 @@ static int sirfsoc_pwrc_resume(struct device *dev)
 
        return 0;
 }
-#endif
 
 static SIMPLE_DEV_PM_OPS(sirfsoc_pwrc_pm_ops, NULL, sirfsoc_pwrc_resume);
 
@@ -205,7 +203,6 @@ static struct platform_driver sirfsoc_pwrc_driver = {
        .remove         = sirfsoc_pwrc_remove,
        .driver         = {
                .name   = "sirfsoc-pwrc",
-               .owner  = THIS_MODULE,
                .pm     = &sirfsoc_pwrc_pm_ops,
                .of_match_table = sirfsoc_pwrc_of_match,
        }