Skip to content

Commit a500aca

Browse files
committed
Merge tag 'devfreq-next-for-6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux
Merge devfreq updates for 6.14 from Chanwoo Choi: "- Call of_node_put() only once in devfreq_event_get_edev_by_phandle() on devfreq-event.c - Remove unused function parameter of exynos_bus_parse_of() on exynos-bus.c" * tag 'devfreq-next-for-6.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux: PM / devfreq: exynos: remove unused function parameter PM / devfreq: event: Call of_node_put() only once in devfreq_event_get_edev_by_phandle()
2 parents 5bc55a3 + f3253b2 commit a500aca

File tree

2 files changed

+4
-9
lines changed

2 files changed

+4
-9
lines changed

drivers/devfreq/devfreq-event.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,9 @@ struct devfreq_event_dev *devfreq_event_get_edev_by_phandle(struct device *dev,
244244
edev = NULL;
245245
out:
246246
mutex_unlock(&devfreq_event_list_lock);
247-
248-
if (!edev) {
249-
of_node_put(node);
250-
return ERR_PTR(-ENODEV);
251-
}
252-
253247
of_node_put(node);
248+
if (!edev)
249+
return ERR_PTR(-ENODEV);
254250

255251
return edev;
256252
}

drivers/devfreq/exynos-bus.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
236236
return ret;
237237
}
238238

239-
static int exynos_bus_parse_of(struct device_node *np,
240-
struct exynos_bus *bus)
239+
static int exynos_bus_parse_of(struct exynos_bus *bus)
241240
{
242241
struct device *dev = bus->dev;
243242
struct dev_pm_opp *opp;
@@ -408,7 +407,7 @@ static int exynos_bus_probe(struct platform_device *pdev)
408407
}
409408

410409
/* Parse the device-tree to get the resource information */
411-
ret = exynos_bus_parse_of(np, bus);
410+
ret = exynos_bus_parse_of(bus);
412411
if (ret < 0)
413412
goto err_reg;
414413

0 commit comments

Comments
 (0)