File tree Expand file tree Collapse file tree 1 file changed +3
-7
lines changed Expand file tree Collapse file tree 1 file changed +3
-7
lines changed Original file line number Diff line number Diff line change @@ -1741,7 +1741,6 @@ static int chv_pinctrl_remove(struct platform_device *pdev)
1741
1741
return 0 ;
1742
1742
}
1743
1743
1744
- #ifdef CONFIG_PM_SLEEP
1745
1744
static int chv_pinctrl_suspend_noirq (struct device * dev )
1746
1745
{
1747
1746
struct intel_pinctrl * pctrl = dev_get_drvdata (dev );
@@ -1825,12 +1824,9 @@ static int chv_pinctrl_resume_noirq(struct device *dev)
1825
1824
1826
1825
return 0 ;
1827
1826
}
1828
- #endif
1829
1827
1830
- static const struct dev_pm_ops chv_pinctrl_pm_ops = {
1831
- SET_NOIRQ_SYSTEM_SLEEP_PM_OPS (chv_pinctrl_suspend_noirq ,
1832
- chv_pinctrl_resume_noirq )
1833
- };
1828
+ static DEFINE_NOIRQ_DEV_PM_OPS (chv_pinctrl_pm_ops ,
1829
+ chv_pinctrl_suspend_noirq , chv_pinctrl_resume_noirq ) ;
1834
1830
1835
1831
static const struct acpi_device_id chv_pinctrl_acpi_match [] = {
1836
1832
{ "INT33FF" , (kernel_ulong_t )chv_soc_data },
@@ -1843,7 +1839,7 @@ static struct platform_driver chv_pinctrl_driver = {
1843
1839
.remove = chv_pinctrl_remove ,
1844
1840
.driver = {
1845
1841
.name = "cherryview-pinctrl" ,
1846
- .pm = & chv_pinctrl_pm_ops ,
1842
+ .pm = pm_sleep_ptr ( & chv_pinctrl_pm_ops ) ,
1847
1843
.acpi_match_table = chv_pinctrl_acpi_match ,
1848
1844
},
1849
1845
};
You can’t perform that action at this time.
0 commit comments