Skip to content

Commit c9008b7

Browse files
committed
pinctrl: mvebu: Switch to use DEFINE_NOIRQ_DEV_PM_OPS() helper
Since pm.h provides a helper for system no-IRQ PM callbacks, switch the driver to use it instead of open coded variant. Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Paul Cercueil <paul@crapouillou.net> Link: https://lore.kernel.org/r/20230717172821.62827-9-andriy.shevchenko@linux.intel.com Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
1 parent f0d8d0e commit c9008b7

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

drivers/pinctrl/mvebu/pinctrl-armada-37xx.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1013,7 +1013,6 @@ static int armada_37xx_pinctrl_register(struct platform_device *pdev,
10131013
return 0;
10141014
}
10151015

1016-
#if defined(CONFIG_PM)
10171016
static int armada_3700_pinctrl_suspend(struct device *dev)
10181017
{
10191018
struct armada_37xx_pinctrl *info = dev_get_drvdata(dev);
@@ -1107,15 +1106,8 @@ static int armada_3700_pinctrl_resume(struct device *dev)
11071106
* Since pinctrl is an infrastructure module, its resume should be issued prior
11081107
* to other IO drivers.
11091108
*/
1110-
static const struct dev_pm_ops armada_3700_pinctrl_pm_ops = {
1111-
.suspend_noirq = armada_3700_pinctrl_suspend,
1112-
.resume_noirq = armada_3700_pinctrl_resume,
1113-
};
1114-
1115-
#define PINCTRL_ARMADA_37XX_DEV_PM_OPS (&armada_3700_pinctrl_pm_ops)
1116-
#else
1117-
#define PINCTRL_ARMADA_37XX_DEV_PM_OPS NULL
1118-
#endif /* CONFIG_PM */
1109+
static DEFINE_NOIRQ_DEV_PM_OPS(armada_3700_pinctrl_pm_ops,
1110+
armada_3700_pinctrl_suspend, armada_3700_pinctrl_resume);
11191111

11201112
static const struct of_device_id armada_37xx_pinctrl_of_match[] = {
11211113
{
@@ -1182,7 +1174,7 @@ static struct platform_driver armada_37xx_pinctrl_driver = {
11821174
.driver = {
11831175
.name = "armada-37xx-pinctrl",
11841176
.of_match_table = armada_37xx_pinctrl_of_match,
1185-
.pm = PINCTRL_ARMADA_37XX_DEV_PM_OPS,
1177+
.pm = pm_sleep_ptr(&armada_3700_pinctrl_pm_ops),
11861178
},
11871179
};
11881180

0 commit comments

Comments
 (0)