diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-17 15:50:00 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-04-17 15:50:00 +0200 |
| commit | 8271f3846fa81cba7e3bdb2b5de88283e5bc3dd1 (patch) | |
| tree | b43061b551cc3f24298dc306f368cd1cdcc4ca2e | |
| parent | Linux 6.3-rc7 (diff) | |
| parent | PM / devfreq: exynos-ppmu: Use devm_platform_get_and_ioremap_resource() (diff) | |
| download | wireguard-linux-8271f3846fa81cba7e3bdb2b5de88283e5bc3dd1.tar.xz wireguard-linux-8271f3846fa81cba7e3bdb2b5de88283e5bc3dd1.zip | |
Merge tag 'devfreq-next-for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux
Pull devfreq updates for v6.4 from Chanwoo Choi:
"1. Remove unneeded SRCU selection in Kconfig because it's always set from
devfreq core.
2. Fix minor updates of devfreq drivers
- Drop of_match_ptr macro from exynos-bus.c because this driver is
always using the DT table for driver probe.
- Use the preferred of_property_present instead of the low-level
of_get_property on exynos-bus.c
- Use devm_platform_get_and_ioream_resource on exyno-ppmu.c"
* tag 'devfreq-next-for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux:
PM / devfreq: exynos-ppmu: Use devm_platform_get_and_ioremap_resource()
PM / devfreq: exynos: Use of_property_present() for testing DT property presence
PM / devfreq: exyos-bus: drop of_match_ptr for ID table
PM / devfreq: Remove "select SRCU"
| -rw-r--r-- | drivers/devfreq/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/devfreq/event/exynos-ppmu.c | 3 | ||||
| -rw-r--r-- | drivers/devfreq/exynos-bus.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig index 9754d8b31621..3c4862a752b5 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -1,7 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only menuconfig PM_DEVFREQ bool "Generic Dynamic Voltage and Frequency Scaling (DVFS) support" - select SRCU select PM_OPP help A device may have a list of frequencies and voltages available. diff --git a/drivers/devfreq/event/exynos-ppmu.c b/drivers/devfreq/event/exynos-ppmu.c index a443e7c42daf..896a6cc93b00 100644 --- a/drivers/devfreq/event/exynos-ppmu.c +++ b/drivers/devfreq/event/exynos-ppmu.c @@ -621,8 +621,7 @@ static int exynos_ppmu_parse_dt(struct platform_device *pdev, } /* Maps the memory mapped IO to control PPMU register */ - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base = devm_ioremap_resource(dev, res); + base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(base)) return PTR_ERR(base); diff --git a/drivers/devfreq/exynos-bus.c b/drivers/devfreq/exynos-bus.c index 027e8f336acc..88414445adf3 100644 --- a/drivers/devfreq/exynos-bus.c +++ b/drivers/devfreq/exynos-bus.c @@ -432,7 +432,7 @@ static int exynos_bus_probe(struct platform_device *pdev) goto err; /* Create child platform device for the interconnect provider */ - if (of_get_property(dev->of_node, "#interconnect-cells", NULL)) { + if (of_property_present(dev->of_node, "#interconnect-cells")) { bus->icc_pdev = platform_device_register_data( dev, "exynos-generic-icc", PLATFORM_DEVID_AUTO, NULL, 0); @@ -513,7 +513,7 @@ static struct platform_driver exynos_bus_platdrv = { .driver = { .name = "exynos-bus", .pm = &exynos_bus_pm, - .of_match_table = of_match_ptr(exynos_bus_of_match), + .of_match_table = exynos_bus_of_match, }, }; module_platform_driver(exynos_bus_platdrv); |