summaryrefslogtreecommitdiff
path: root/drivers/clk/clk-s2mps11.c
diff options
context:
space:
mode:
authorMike Turquette <mturquette@linaro.org>2014-07-03 22:55:42 +0400
committerMike Turquette <mturquette@linaro.org>2014-07-03 22:55:42 +0400
commitcdae1730d0c6b644b6df3a97618be89fde5e074d (patch)
tree4f1012d672dab49029e1fbef1694087b4d3deb0f /drivers/clk/clk-s2mps11.c
parentfb2b3c9f68574738c70b9df5fc2bea40f91dd8be (diff)
parentc556bcddc78096caeb46dbe3ad0314dd951f1665 (diff)
downloadlinux-cdae1730d0c6b644b6df3a97618be89fde5e074d.tar.xz
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers/clk/clk-s2mps11.c')
-rw-r--r--drivers/clk/clk-s2mps11.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
index 13878da1e2e4..b7797fb12e12 100644
--- a/drivers/clk/clk-s2mps11.c
+++ b/drivers/clk/clk-s2mps11.c
@@ -219,16 +219,13 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
goto err_reg;
}
- s2mps11_clk->lookup = devm_kzalloc(&pdev->dev,
- sizeof(struct clk_lookup), GFP_KERNEL);
+ s2mps11_clk->lookup = clkdev_alloc(s2mps11_clk->clk,
+ s2mps11_name(s2mps11_clk), NULL);
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);
}