Skip to content

Commit

Permalink
Merge tag 'devfreq-next-for-6.14' of ssh://gitolite.kernel.org/pub/sc…
Browse files Browse the repository at this point in the history
…m/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()
  • Loading branch information
rafaeljw committed Jan 13, 2025
2 parents 5bc55a3 + f3253b2 commit a500aca
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
8 changes: 2 additions & 6 deletions drivers/devfreq/devfreq-event.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,13 +244,9 @@ struct devfreq_event_dev *devfreq_event_get_edev_by_phandle(struct device *dev,
edev = NULL;
out:
mutex_unlock(&devfreq_event_list_lock);

if (!edev) {
of_node_put(node);
return ERR_PTR(-ENODEV);
}

of_node_put(node);
if (!edev)
return ERR_PTR(-ENODEV);

return edev;
}
Expand Down
5 changes: 2 additions & 3 deletions drivers/devfreq/exynos-bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,7 @@ static int exynos_bus_parent_parse_of(struct device_node *np,
return ret;
}

static int exynos_bus_parse_of(struct device_node *np,
struct exynos_bus *bus)
static int exynos_bus_parse_of(struct exynos_bus *bus)
{
struct device *dev = bus->dev;
struct dev_pm_opp *opp;
Expand Down Expand Up @@ -408,7 +407,7 @@ static int exynos_bus_probe(struct platform_device *pdev)
}

/* Parse the device-tree to get the resource information */
ret = exynos_bus_parse_of(np, bus);
ret = exynos_bus_parse_of(bus);
if (ret < 0)
goto err_reg;

Expand Down

0 comments on commit a500aca

Please sign in to comment.