pinctrl: icelake: Switch to use Intel pin control PM ops
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 30 Oct 2023 12:07:27 +0000 (14:07 +0200)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Mon, 13 Nov 2023 11:33:27 +0000 (13:33 +0200)
The main driver conditionally exports the PM ops structure.
Switch this driver to use it instead of customly wrapped one.

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20231030120734.2831419-11-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
drivers/pinctrl/intel/pinctrl-icelake.c

index 300e1538c8d0551d21e6215ba7c931ad82dd48a8..fe3042de891a61d41b17dce76b471c37887150a5 100644 (file)
@@ -10,6 +10,7 @@
 #include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
+#include <linux/pm.h>
 
 #include <linux/pinctrl/pinctrl.h>
 
@@ -668,8 +669,6 @@ static const struct intel_pinctrl_soc_data icln_soc_data = {
        .ncommunities = ARRAY_SIZE(icln_communities),
 };
 
-static INTEL_PINCTRL_PM_OPS(icl_pinctrl_pm_ops);
-
 static const struct acpi_device_id icl_pinctrl_acpi_match[] = {
        { "INT3455", (kernel_ulong_t)&icllp_soc_data },
        { "INT34C3", (kernel_ulong_t)&icln_soc_data },
@@ -682,7 +681,7 @@ static struct platform_driver icl_pinctrl_driver = {
        .driver = {
                .name = "icelake-pinctrl",
                .acpi_match_table = icl_pinctrl_acpi_match,
-               .pm = &icl_pinctrl_pm_ops,
+               .pm = pm_sleep_ptr(&intel_pinctrl_pm_ops),
        },
 };
 module_platform_driver(icl_pinctrl_driver);