diff options
Diffstat (limited to 'drivers/clk/zynqmp')
-rw-r--r-- | drivers/clk/zynqmp/clk-gate-zynqmp.c | 4 | ||||
-rw-r--r-- | drivers/clk/zynqmp/clk-mux-zynqmp.c | 2 | ||||
-rw-r--r-- | drivers/clk/zynqmp/clk-zynqmp.h | 1 | ||||
-rw-r--r-- | drivers/clk/zynqmp/clkc.c | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/drivers/clk/zynqmp/clk-gate-zynqmp.c b/drivers/clk/zynqmp/clk-gate-zynqmp.c index 695feaa82da5..565ed67a0430 100644 --- a/drivers/clk/zynqmp/clk-gate-zynqmp.c +++ b/drivers/clk/zynqmp/clk-gate-zynqmp.c @@ -12,7 +12,7 @@ #include "clk-zynqmp.h" /** - * struct clk_gate - gating clock + * struct zynqmp_clk_gate - gating clock * @hw: handle between common and hardware-specific interfaces * @flags: hardware-specific flags * @clk_id: Id of clock @@ -66,7 +66,7 @@ static void zynqmp_clk_gate_disable(struct clk_hw *hw) } /** - * zynqmp_clk_gate_is_enable() - Check clock state + * zynqmp_clk_gate_is_enabled() - Check clock state * @hw: handle between common and hardware-specific interfaces * * Return: 1 if enabled, 0 if disabled else error code diff --git a/drivers/clk/zynqmp/clk-mux-zynqmp.c b/drivers/clk/zynqmp/clk-mux-zynqmp.c index 157d4a960bf4..17afce594f28 100644 --- a/drivers/clk/zynqmp/clk-mux-zynqmp.c +++ b/drivers/clk/zynqmp/clk-mux-zynqmp.c @@ -159,7 +159,7 @@ struct clk_hw *zynqmp_clk_register_mux(const char *name, u32 clk_id, hw = &mux->hw; ret = clk_hw_register(NULL, hw); if (ret) { - kfree(hw); + kfree(mux); hw = ERR_PTR(ret); } diff --git a/drivers/clk/zynqmp/clk-zynqmp.h b/drivers/clk/zynqmp/clk-zynqmp.h index 84fa80a969a9..60cbc0674a9e 100644 --- a/drivers/clk/zynqmp/clk-zynqmp.h +++ b/drivers/clk/zynqmp/clk-zynqmp.h @@ -56,6 +56,7 @@ enum topology_type { * @type: Type of topology * @flag: Topology flags * @type_flag: Topology type specific flag + * @custom_type_flag: Topology type specific custom flag */ struct clock_topology { u32 type; diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c index 871184e406e1..eb25303eefed 100644 --- a/drivers/clk/zynqmp/clkc.c +++ b/drivers/clk/zynqmp/clkc.c @@ -762,9 +762,7 @@ static int zynqmp_clk_setup(struct device_node *np) zynqmp_register_clocks(np); zynqmp_data->num = clock_max_idx; - of_clk_add_hw_provider(np, of_clk_hw_onecell_get, zynqmp_data); - - return 0; + return of_clk_add_hw_provider(np, of_clk_hw_onecell_get, zynqmp_data); } static int zynqmp_clock_probe(struct platform_device *pdev) |