Skip to content

Commit 8fd5161

Browse files
raagjadavandy-shev
authored andcommitted
pinctrl: baytrail: drop runtime PM support
Since Baytrail pinctrl device is not attached to acpi_lpss_pm_domain, runtime PM serves no purpose here. Drop it and switch to pm_sleep_ptr() as now we only have suspend and resume handles in place. Signed-off-by: Raag Jadav <[email protected]> Acked-by: Mika Westerberg <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Andy Shevchenko <[email protected]>
1 parent 1209d59 commit 8fd5161

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

drivers/pinctrl/intel/pinctrl-baytrail.c

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <linux/module.h>
1717
#include <linux/types.h>
1818
#include <linux/platform_device.h>
19-
#include <linux/pm_runtime.h>
19+
#include <linux/pm.h>
2020
#include <linux/property.h>
2121
#include <linux/seq_file.h>
2222
#include <linux/string_helpers.h>
@@ -722,8 +722,6 @@ static int byt_gpio_request_enable(struct pinctrl_dev *pctl_dev,
722722

723723
raw_spin_unlock_irqrestore(&byt_lock, flags);
724724

725-
pm_runtime_get(vg->dev);
726-
727725
return 0;
728726
}
729727

@@ -734,7 +732,6 @@ static void byt_gpio_disable_free(struct pinctrl_dev *pctl_dev,
734732
struct intel_pinctrl *vg = pinctrl_dev_get_drvdata(pctl_dev);
735733

736734
byt_gpio_clear_triggering(vg, offset);
737-
pm_runtime_put(vg->dev);
738735
}
739736

740737
static void byt_gpio_direct_irq_check(struct intel_pinctrl *vg,
@@ -1661,7 +1658,6 @@ static int byt_pinctrl_probe(struct platform_device *pdev)
16611658
return ret;
16621659

16631660
platform_set_drvdata(pdev, vg);
1664-
pm_runtime_enable(dev);
16651661

16661662
return 0;
16671663
}
@@ -1750,26 +1746,15 @@ static int byt_gpio_resume(struct device *dev)
17501746
return 0;
17511747
}
17521748

1753-
static int byt_gpio_runtime_suspend(struct device *dev)
1754-
{
1755-
return 0;
1756-
}
1757-
1758-
static int byt_gpio_runtime_resume(struct device *dev)
1759-
{
1760-
return 0;
1761-
}
1762-
17631749
static const struct dev_pm_ops byt_gpio_pm_ops = {
17641750
LATE_SYSTEM_SLEEP_PM_OPS(byt_gpio_suspend, byt_gpio_resume)
1765-
RUNTIME_PM_OPS(byt_gpio_runtime_suspend, byt_gpio_runtime_resume, NULL)
17661751
};
17671752

17681753
static struct platform_driver byt_gpio_driver = {
17691754
.probe = byt_pinctrl_probe,
17701755
.driver = {
17711756
.name = "byt_gpio",
1772-
.pm = pm_ptr(&byt_gpio_pm_ops),
1757+
.pm = pm_sleep_ptr(&byt_gpio_pm_ops),
17731758
.acpi_match_table = byt_gpio_acpi_match,
17741759
.suppress_bind_attrs = true,
17751760
},

0 commit comments

Comments
 (0)