Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
clk
/
clk-s2mps11.c
diff --git
a/kernel/drivers/clk/clk-s2mps11.c
b/kernel/drivers/clk/clk-s2mps11.c
index
bfa1e64
..
d266299
100644
(file)
--- a/
kernel/drivers/clk/clk-s2mps11.c
+++ b/
kernel/drivers/clk/clk-s2mps11.c
@@
-58,21
+58,17
@@
static struct s2mps11_clk *to_s2mps11_clk(struct clk_hw *hw)
static int s2mps11_clk_prepare(struct clk_hw *hw)
{
struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw);
static int s2mps11_clk_prepare(struct clk_hw *hw)
{
struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw);
- int ret;
- ret
=
regmap_update_bits(s2mps11->iodev->regmap_pmic,
+ ret
urn
regmap_update_bits(s2mps11->iodev->regmap_pmic,
s2mps11->reg,
s2mps11->mask, s2mps11->mask);
s2mps11->reg,
s2mps11->mask, s2mps11->mask);
-
- return ret;
}
static void s2mps11_clk_unprepare(struct clk_hw *hw)
{
struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw);
}
static void s2mps11_clk_unprepare(struct clk_hw *hw)
{
struct s2mps11_clk *s2mps11 = to_s2mps11_clk(hw);
- int ret;
- re
t = re
gmap_update_bits(s2mps11->iodev->regmap_pmic, s2mps11->reg,
+ regmap_update_bits(s2mps11->iodev->regmap_pmic, s2mps11->reg,
s2mps11->mask, ~s2mps11->mask);
}
s2mps11->mask, ~s2mps11->mask);
}
@@
-186,15
+182,15
@@
static int s2mps11_clk_probe(struct platform_device *pdev)
struct clk_init_data *clks_init;
int i, ret = 0;
struct clk_init_data *clks_init;
int i, ret = 0;
- s2mps11_clks = devm_k
zalloc(&pdev->dev, sizeof(*s2mps11_clk) *
-
S2MPS11_CLKS_NUM
, GFP_KERNEL);
+ s2mps11_clks = devm_k
calloc(&pdev->dev, S2MPS11_CLKS_NUM,
+
sizeof(*s2mps11_clk)
, GFP_KERNEL);
if (!s2mps11_clks)
return -ENOMEM;
s2mps11_clk = s2mps11_clks;
if (!s2mps11_clks)
return -ENOMEM;
s2mps11_clk = s2mps11_clks;
- clk_table = devm_k
zalloc(&pdev->dev, sizeof(struct clk *) *
-
S2MPS11_CLKS_NUM
, GFP_KERNEL);
+ clk_table = devm_k
calloc(&pdev->dev, S2MPS11_CLKS_NUM,
+
sizeof(struct clk *)
, GFP_KERNEL);
if (!clk_table)
return -ENOMEM;
if (!clk_table)
return -ENOMEM;
@@
-242,14
+238,12
@@
static int s2mps11_clk_probe(struct platform_device *pdev)
goto err_reg;
}
goto err_reg;
}
- s2mps11_clk->lookup = clkdev_
alloc
(s2mps11_clk->clk,
+ s2mps11_clk->lookup = clkdev_
create
(s2mps11_clk->clk,
s2mps11_name(s2mps11_clk), NULL);
if (!s2mps11_clk->lookup) {
ret = -ENOMEM;
s2mps11_name(s2mps11_clk), NULL);
if (!s2mps11_clk->lookup) {
ret = -ENOMEM;
- goto err_
lup
;
+ goto err_
reg
;
}
}
-
- clkdev_add(s2mps11_clk->lookup);
}
for (i = 0; i < S2MPS11_CLKS_NUM; i++) {
}
for (i = 0; i < S2MPS11_CLKS_NUM; i++) {
@@
-267,16
+261,10
@@
static int s2mps11_clk_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, s2mps11_clks);
return ret;
platform_set_drvdata(pdev, s2mps11_clks);
return ret;
-err_lup:
- devm_clk_unregister(&pdev->dev, s2mps11_clk->clk);
+
err_reg:
err_reg:
- while (s2mps11_clk > s2mps11_clks) {
- if (s2mps11_clk->lookup) {
- clkdev_drop(s2mps11_clk->lookup);
- devm_clk_unregister(&pdev->dev, s2mps11_clk->clk);
- }
- s2mps11_clk--;
- }
+ while (--i >= 0)
+ clkdev_drop(s2mps11_clks[i].lookup);
return ret;
}
return ret;
}
@@
-324,7
+312,7
@@
static int __init s2mps11_clk_init(void)
}
subsys_initcall(s2mps11_clk_init);
}
subsys_initcall(s2mps11_clk_init);
-static void __
in
it s2mps11_clk_cleanup(void)
+static void __
ex
it s2mps11_clk_cleanup(void)
{
platform_driver_unregister(&s2mps11_clk_driver);
}
{
platform_driver_unregister(&s2mps11_clk_driver);
}