mptcp: simplify subflow_syn_recv_sock()

[linux.git] / drivers / input / misc / stpmic1_onkey.c

diff --git a/drivers/input/misc/stpmic1_onkey.c b/drivers/input/misc/stpmic1_onkey.c
index d8dc2f2f80000eebac79e8833d533185cf90a087..d5ebca7b90a59445afa211e4589c509f95b16fa8 100644 (file)
--- a/drivers/input/misc/stpmic1_onkey.c
+++ b/drivers/input/misc/stpmic1_onkey.c
@@ -142,7 +142,7 @@ static int stpmic1_onkey_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __maybe_unused stpmic1_onkey_suspend(struct device *dev)
+static int stpmic1_onkey_suspend(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct stpmic1_onkey *onkey = platform_get_drvdata(pdev);
@@ -154,7 +154,7 @@ static int __maybe_unused stpmic1_onkey_suspend(struct device *dev)
        return 0;
 }
 
-static int __maybe_unused stpmic1_onkey_resume(struct device *dev)
+static int stpmic1_onkey_resume(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct stpmic1_onkey *onkey = platform_get_drvdata(pdev);
@@ -166,9 +166,9 @@ static int __maybe_unused stpmic1_onkey_resume(struct device *dev)
        return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(stpmic1_onkey_pm,
-                        stpmic1_onkey_suspend,
-                        stpmic1_onkey_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(stpmic1_onkey_pm,
+                               stpmic1_onkey_suspend,
+                               stpmic1_onkey_resume);
 
 static const struct of_device_id of_stpmic1_onkey_match[] = {
        { .compatible = "st,stpmic1-onkey" },
@@ -182,7 +182,7 @@ static struct platform_driver stpmic1_onkey_driver = {
        .driver = {
                .name   = "stpmic1_onkey",
                .of_match_table = of_match_ptr(of_stpmic1_onkey_match),
-               .pm     = &stpmic1_onkey_pm,
+               .pm     = pm_sleep_ptr(&stpmic1_onkey_pm),
        },
 };
 module_platform_driver(stpmic1_onkey_driver);