summaryrefslogtreecommitdiffstats
path: root/drivers/clk/spear/clk-vco-pll.c
diff options
context:
space:
mode:
authorStephen Boyd2017-11-15 17:16:13 +0100
committerStephen Boyd2017-11-15 17:16:13 +0100
commit36331641eb4296f0c62f4bf1e320d8c30bc6a863 (patch)
tree301cb332c2394a9c5b7066065accd8f1194fde13 /drivers/clk/spear/clk-vco-pll.c
parentclk: stm32h7: fix test of clock config (diff)
parentclk: kona-setup: Delete error messages for failed memory allocations (diff)
downloadkernel-qcow2-linux-36331641eb4296f0c62f4bf1e320d8c30bc6a863.tar.gz
kernel-qcow2-linux-36331641eb4296f0c62f4bf1e320d8c30bc6a863.tar.xz
kernel-qcow2-linux-36331641eb4296f0c62f4bf1e320d8c30bc6a863.zip
Merge branch 'clk-cleanup' into clk-next
* clk-cleanup: clk: kona-setup: Delete error messages for failed memory allocations ARC: clk: fix spelling mistake: "configurarion" -> "configuration" clk: cdce925: remove redundant check for non-null parent_name clk: versatile: Improve sizeof() usage clk: versatile: Delete error messages for failed memory allocations clk: ux500: Improve sizeof() usage clk: ux500: Delete error messages for failed memory allocations clk: spear: Delete error messages for failed memory allocations clk: ti: Delete error messages for failed memory allocations clk: mmp: Adjust checks for NULL pointers clk: mmp: Use common error handling code in mmp_clk_register_mix() clk: mmp: Delete error messages for failed memory allocations clk: clk-xgene: Adjust six checks for null pointers clk: clk-xgene: Delete error messages for failed memory allocations clk: clk-u300: Fix a typo in two comment lines clk: clk-u300: Add some spaces for better code readability clk: clk-u300: Improve sizeof() usage clk: clk-u300: Delete error messages for failed memory allocations clk: clk-mux: Improve a size determination in clk_hw_register_mux_table() clk: clk-mux: Delete an error message for a failed memory allocation
Diffstat (limited to 'drivers/clk/spear/clk-vco-pll.c')
-rw-r--r--drivers/clk/spear/clk-vco-pll.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/clk/spear/clk-vco-pll.c b/drivers/clk/spear/clk-vco-pll.c
index 069b48a44f80..c08dec30bfa6 100644
--- a/drivers/clk/spear/clk-vco-pll.c
+++ b/drivers/clk/spear/clk-vco-pll.c
@@ -292,16 +292,12 @@ struct clk *clk_register_vco_pll(const char *vco_name, const char *pll_name,
}
vco = kzalloc(sizeof(*vco), GFP_KERNEL);
- if (!vco) {
- pr_err("could not allocate vco clk\n");
+ if (!vco)
return ERR_PTR(-ENOMEM);
- }
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
- if (!pll) {
- pr_err("could not allocate pll clk\n");
+ if (!pll)
goto free_vco;
- }
/* struct clk_vco assignments */
vco->mode_reg = mode_reg;