diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2023-11-13 13:34:03 +0200 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2023-11-13 13:34:03 +0200 |
| commit | 113adaf8f8ea6aa6fc3b174c68ec1c5588a2635c (patch) | |
| tree | f355aa152f1d310e04ae8375d98502cc32f1b3bc /drivers/pinctrl/intel/pinctrl-cedarfork.c | |
| parent | b85ea95d086471afb4ad062012a4d73cd328fa86 (diff) | |
| parent | 649e984f5ed8ca868f19a480966cc0820f76e22a (diff) | |
Merge patch series "pinctrl: intel: Use NOIRQ PM helper"
Andy Shevchenko <andriy.shevchenko@linux.intel.com> says:
Intel pin control drivers use NOIRQ variant of the PM callbacks.
To make them smaller and less error prone against different
kernel configurations (with possible defined but not used variables)
switch to use NOIRQ PM helper.
Link: https://lore.kernel.org/r/20231030120734.2831419-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'drivers/pinctrl/intel/pinctrl-cedarfork.c')
| -rw-r--r-- | drivers/pinctrl/intel/pinctrl-cedarfork.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pinctrl/intel/pinctrl-cedarfork.c b/drivers/pinctrl/intel/pinctrl-cedarfork.c index a20465eb2dc6..48af8930dd1f 100644 --- a/drivers/pinctrl/intel/pinctrl-cedarfork.c +++ b/drivers/pinctrl/intel/pinctrl-cedarfork.c @@ -9,6 +9,7 @@ #include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/pm.h> #include <linux/pinctrl/pinctrl.h> @@ -319,8 +320,6 @@ static const struct intel_pinctrl_soc_data cdf_soc_data = { .ncommunities = ARRAY_SIZE(cdf_communities), }; -static INTEL_PINCTRL_PM_OPS(cdf_pinctrl_pm_ops); - static const struct acpi_device_id cdf_pinctrl_acpi_match[] = { { "INTC3001", (kernel_ulong_t)&cdf_soc_data }, { } @@ -332,7 +331,7 @@ static struct platform_driver cdf_pinctrl_driver = { .driver = { .name = "cedarfork-pinctrl", .acpi_match_table = cdf_pinctrl_acpi_match, - .pm = &cdf_pinctrl_pm_ops, + .pm = pm_sleep_ptr(&intel_pinctrl_pm_ops), }, }; |