@@ -1013,7 +1013,6 @@ static int armada_37xx_pinctrl_register(struct platform_device *pdev,
1013
1013
return 0 ;
1014
1014
}
1015
1015
1016
- #if defined(CONFIG_PM )
1017
1016
static int armada_3700_pinctrl_suspend (struct device * dev )
1018
1017
{
1019
1018
struct armada_37xx_pinctrl * info = dev_get_drvdata (dev );
@@ -1107,15 +1106,8 @@ static int armada_3700_pinctrl_resume(struct device *dev)
1107
1106
* Since pinctrl is an infrastructure module, its resume should be issued prior
1108
1107
* to other IO drivers.
1109
1108
*/
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 ) ;
1119
1111
1120
1112
static const struct of_device_id armada_37xx_pinctrl_of_match [] = {
1121
1113
{
@@ -1182,7 +1174,7 @@ static struct platform_driver armada_37xx_pinctrl_driver = {
1182
1174
.driver = {
1183
1175
.name = "armada-37xx-pinctrl" ,
1184
1176
.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 ) ,
1186
1178
},
1187
1179
};
1188
1180
0 commit comments