mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
Merge branch 'clkdev' of git://git.armlinux.org.uk/~rmk/linux-arm
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()
This commit is contained in:
commit
c2d9f5bc2d
1 changed files with 1 additions and 4 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue