Skip to content

Commit b70c674

Browse files
committed
pinctrl: icelake: Switch to use Intel pin control PM ops
The main driver conditionally exports the PM ops structure. Switch this driver to use it instead of customly wrapped one. Acked-by: Mika Westerberg <[email protected]> Acked-by: Linus Walleij <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Andy Shevchenko <[email protected]>
1 parent 3f67910 commit b70c674

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/pinctrl/intel/pinctrl-icelake.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/acpi.h>
1111
#include <linux/module.h>
1212
#include <linux/platform_device.h>
13+
#include <linux/pm.h>
1314

1415
#include <linux/pinctrl/pinctrl.h>
1516

@@ -668,8 +669,6 @@ static const struct intel_pinctrl_soc_data icln_soc_data = {
668669
.ncommunities = ARRAY_SIZE(icln_communities),
669670
};
670671

671-
static INTEL_PINCTRL_PM_OPS(icl_pinctrl_pm_ops);
672-
673672
static const struct acpi_device_id icl_pinctrl_acpi_match[] = {
674673
{ "INT3455", (kernel_ulong_t)&icllp_soc_data },
675674
{ "INT34C3", (kernel_ulong_t)&icln_soc_data },
@@ -682,7 +681,7 @@ static struct platform_driver icl_pinctrl_driver = {
682681
.driver = {
683682
.name = "icelake-pinctrl",
684683
.acpi_match_table = icl_pinctrl_acpi_match,
685-
.pm = &icl_pinctrl_pm_ops,
684+
.pm = pm_sleep_ptr(&intel_pinctrl_pm_ops),
686685
},
687686
};
688687
module_platform_driver(icl_pinctrl_driver);

0 commit comments

Comments
 (0)