Commit 113adaf8 authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parents b85ea95d 649e984f

drivers/pinctrl/intel/pinctrl-alderlake.c

+2 −3
Original line number Diff line number Diff line
@@ -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>
@@ -733,14 +734,12 @@ static const struct acpi_device_id adl_pinctrl_acpi_match[] = { 
};

MODULE_DEVICE_TABLE(acpi, adl_pinctrl_acpi_match);



static INTEL_PINCTRL_PM_OPS(adl_pinctrl_pm_ops);



static struct platform_driver adl_pinctrl_driver = {

	.probe = intel_pinctrl_probe_by_hid,

	.driver = {

		.name = "alderlake-pinctrl",

		.acpi_match_table = adl_pinctrl_acpi_match,

		.pm = &adl_pinctrl_pm_ops,

		.pm = pm_sleep_ptr(&intel_pinctrl_pm_ops),

	},

};

module_platform_driver(adl_pinctrl_driver);

drivers/pinctrl/intel/pinctrl-broxton.c

+2 −3
Original line number Diff line number Diff line
@@ -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>
@@ -1000,14 +1001,12 @@ static const struct platform_device_id bxt_pinctrl_platform_ids[] = { 
};

MODULE_DEVICE_TABLE(platform, bxt_pinctrl_platform_ids);



static INTEL_PINCTRL_PM_OPS(bxt_pinctrl_pm_ops);



static struct platform_driver bxt_pinctrl_driver = {

	.probe = intel_pinctrl_probe_by_uid,

	.driver = {

		.name = "broxton-pinctrl",

		.acpi_match_table = bxt_pinctrl_acpi_match,

		.pm = &bxt_pinctrl_pm_ops,

		.pm = pm_sleep_ptr(&intel_pinctrl_pm_ops),

	},

	.id_table = bxt_pinctrl_platform_ids,

};

drivers/pinctrl/intel/pinctrl-cannonlake.c

+2 −3
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/pm.h>



#include <linux/pinctrl/pinctrl.h>
@@ -824,14 +825,12 @@ static const struct acpi_device_id cnl_pinctrl_acpi_match[] = { 
};

MODULE_DEVICE_TABLE(acpi, cnl_pinctrl_acpi_match);



static INTEL_PINCTRL_PM_OPS(cnl_pinctrl_pm_ops);



static struct platform_driver cnl_pinctrl_driver = {

	.probe = intel_pinctrl_probe_by_hid,

	.driver = {

		.name = "cannonlake-pinctrl",

		.acpi_match_table = cnl_pinctrl_acpi_match,

		.pm = &cnl_pinctrl_pm_ops,

		.pm = pm_sleep_ptr(&intel_pinctrl_pm_ops),

	},

};

module_platform_driver(cnl_pinctrl_driver);

drivers/pinctrl/intel/pinctrl-cedarfork.c

+2 −3
Original line number Diff line number Diff line
@@ -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),

	},

};

drivers/pinctrl/intel/pinctrl-denverton.c

+2 −3
Original line number Diff line number Diff line
@@ -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>
@@ -249,8 +250,6 @@ static const struct intel_pinctrl_soc_data dnv_soc_data = { 
	.ncommunities = ARRAY_SIZE(dnv_communities),

};



static INTEL_PINCTRL_PM_OPS(dnv_pinctrl_pm_ops);



static const struct acpi_device_id dnv_pinctrl_acpi_match[] = {

	{ "INTC3000", (kernel_ulong_t)&dnv_soc_data },

	{ }
@@ -268,7 +267,7 @@ static struct platform_driver dnv_pinctrl_driver = { 
	.driver = {

		.name = "denverton-pinctrl",

		.acpi_match_table = dnv_pinctrl_acpi_match,

		.pm = &dnv_pinctrl_pm_ops,

		.pm = pm_sleep_ptr(&intel_pinctrl_pm_ops),

	},

	.id_table = dnv_pinctrl_platform_ids,

};