projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/irq-renesas-intc-irqpin-to-v3.18-rc1' into...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
clk
/
clk-s2mps11.c
diff --git
a/drivers/clk/clk-s2mps11.c
b/drivers/clk/clk-s2mps11.c
index
00a3abe
..
611b936
100644
(file)
--- a/
drivers/clk/clk-s2mps11.c
+++ b/
drivers/clk/clk-s2mps11.c
@@
-130,7
+130,7
@@
static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev)
int i;
if (!iodev->dev->of_node)
int i;
if (!iodev->dev->of_node)
- return
NULL
;
+ return
ERR_PTR(-EINVAL)
;
clk_np = of_find_node_by_name(iodev->dev->of_node, "clocks");
if (!clk_np) {
clk_np = of_find_node_by_name(iodev->dev->of_node, "clocks");
if (!clk_np) {
@@
-190,16
+190,13
@@
static int s2mps11_clk_probe(struct platform_device *pdev)
goto err_reg;
}
goto err_reg;
}
- s2mps11_clk->lookup =
devm_kzalloc(&pdev->dev
,
- s
izeof(struct clk_lookup), GFP_KERNE
L);
+ s2mps11_clk->lookup =
clkdev_alloc(s2mps11_clk->clk
,
+ s
2mps11_name(s2mps11_clk), NUL
L);
if (!s2mps11_clk->lookup) {
ret = -ENOMEM;
goto err_lup;
}
if (!s2mps11_clk->lookup) {
ret = -ENOMEM;
goto err_lup;
}
- s2mps11_clk->lookup->con_id = s2mps11_name(s2mps11_clk);
- s2mps11_clk->lookup->clk = s2mps11_clk->clk;
-
clkdev_add(s2mps11_clk->lookup);
}
clkdev_add(s2mps11_clk->lookup);
}