Message ID | 1524063005-1716-5-git-send-email-geert+renesas@glider.be (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Apr 18, 2018 at 04:50:04PM +0200, Geert Uytterhoeven wrote: > As of_clk_get_parent_count() returns zero on failure, while > of_count_phandle_with_args() might return a negative error code, this > also fixes the issue of possibly using a very big number in the > allocation below. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Acked-by: Jon Hunter <jonathanh@nvidia.com> > --- > This depends on "[PATCH v3 1/5] clk: Extract OF clock helpers in > <linux/of_clk.h>". > > v3: > - Add Acked-by, > > v2: > - of_clk_get_parent_count() was moved to <linux/of_clk.h>. > --- Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org> <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Quoting Geert Uytterhoeven (2018-04-18 07:50:04) > As of_clk_get_parent_count() returns zero on failure, while > of_count_phandle_with_args() might return a negative error code, this > also fixes the issue of possibly using a very big number in the > allocation below. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > Acked-by: Jon Hunter <jonathanh@nvidia.com> > --- Applied to clk-next
diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index d9fcdb592b3966a5..d8cb48a4b8eb1b78 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -31,6 +31,7 @@ #include <linux/iopoll.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/of_clk.h> #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> @@ -725,7 +726,7 @@ static int tegra_powergate_of_get_clks(struct tegra_powergate *pg, unsigned int i, count; int err; - count = of_count_phandle_with_args(np, "clocks", "#clock-cells"); + count = of_clk_get_parent_count(np); if (count == 0) return -ENODEV;