Merge branch 'clkdev' of git://git.armlinux.org.uk/~rmk/linux-arm (c2d9f5bc) · Commits · 戴 / test

Pull ARM clkdev updates from Russell King: "A couple of cleanups for clkdev" * 'clkdev' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: 8778/1: clkdev: don't call __of_clk_get_by_name() unnecessarily from clk_get() ARM: 8776/1: clkdev: Remove duplicated negative index check from __of_clk_get()

drivers/clk/clkdev.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -35,9 +35,6 @@ static struct clk __of_clk_get(struct device_node np, int index,
		struct clk *clk;
		int rc;

		if (index < 0)
		return ERR_PTR(-EINVAL);

		rc = of_parse_phandle_with_args(np, "clocks", "#clock-cells", index,
		&clkspec);
		if (rc)
		@@ -199,7 +196,7 @@ struct clk clk_get(struct device dev, const char *con_id)
		const char *dev_id = dev ? dev_name(dev) : NULL;
		struct clk *clk;

		if (dev) {
		if (dev && dev->of_node) {
		clk = __of_clk_get_by_name(dev->of_node, dev_id, con_id);
		if (!IS_ERR(clk) \|\| PTR_ERR(clk) == -EPROBE_DEFER)
		return clk;

Admin message