Skip to content

Commit 8271f38

Browse files
committed
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"
2 parents 6a8f57a + 376b144 commit 8271f38

3 files changed

Lines changed: 3 additions & 5 deletions

File tree

drivers/devfreq/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
menuconfig PM_DEVFREQ
33
bool "Generic Dynamic Voltage and Frequency Scaling (DVFS) support"
4-
select SRCU
54
select PM_OPP
65
help
76
A device may have a list of frequencies and voltages available.

drivers/devfreq/event/exynos-ppmu.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,7 @@ static int exynos_ppmu_parse_dt(struct platform_device *pdev,
621621
}
622622

623623
/* Maps the memory mapped IO to control PPMU register */
624-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
625-
base = devm_ioremap_resource(dev, res);
624+
base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
626625
if (IS_ERR(base))
627626
return PTR_ERR(base);
628627

drivers/devfreq/exynos-bus.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ static int exynos_bus_probe(struct platform_device *pdev)
432432
goto err;
433433

434434
/* Create child platform device for the interconnect provider */
435-
if (of_get_property(dev->of_node, "#interconnect-cells", NULL)) {
435+
if (of_property_present(dev->of_node, "#interconnect-cells")) {
436436
bus->icc_pdev = platform_device_register_data(
437437
dev, "exynos-generic-icc",
438438
PLATFORM_DEVID_AUTO, NULL, 0);
@@ -513,7 +513,7 @@ static struct platform_driver exynos_bus_platdrv = {
513513
.driver = {
514514
.name = "exynos-bus",
515515
.pm = &exynos_bus_pm,
516-
.of_match_table = of_match_ptr(exynos_bus_of_match),
516+
.of_match_table = exynos_bus_of_match,
517517
},
518518
};
519519
module_platform_driver(exynos_bus_platdrv);

0 commit comments

Comments
 (0)