Merge branches 'clk-dt-name', 'clk-ti-of-node' and 'clk-sa' into clk-next
- Use updated printk format for OF node names - Fix TI code to only search DT subnodes - Various static analysis finds * clk-dt-name: clk: Convert to using %pOFn instead of device_node.name * clk-ti-of-node: clk: ti: fix OF child-node lookup * clk-sa: clk: mvebu: armada-37xx-tbg: Switch to clk_get and balance it in probe reset: hisilicon: fix potential NULL pointer dereference clk: cdce925: release child device nodes clk: qcom: clk-branch: Use true and false for boolean values
This commit is contained in:
@@ -309,8 +309,8 @@ static void __init cpg_div6_clock_init(struct device_node *np)
|
||||
|
||||
num_parents = of_clk_get_parent_count(np);
|
||||
if (num_parents < 1) {
|
||||
pr_err("%s: no parent found for %s DIV6 clock\n",
|
||||
__func__, np->name);
|
||||
pr_err("%s: no parent found for %pOFn DIV6 clock\n",
|
||||
__func__, np);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -321,8 +321,8 @@ static void __init cpg_div6_clock_init(struct device_node *np)
|
||||
|
||||
reg = of_iomap(np, 0);
|
||||
if (reg == NULL) {
|
||||
pr_err("%s: failed to map %s DIV6 clock register\n",
|
||||
__func__, np->name);
|
||||
pr_err("%s: failed to map %pOFn DIV6 clock register\n",
|
||||
__func__, np);
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -334,8 +334,8 @@ static void __init cpg_div6_clock_init(struct device_node *np)
|
||||
|
||||
clk = cpg_div6_register(clk_name, num_parents, parent_names, reg, NULL);
|
||||
if (IS_ERR(clk)) {
|
||||
pr_err("%s: failed to register %s DIV6 clock (%ld)\n",
|
||||
__func__, np->name, PTR_ERR(clk));
|
||||
pr_err("%s: failed to register %pOFn DIV6 clock (%ld)\n",
|
||||
__func__, np, PTR_ERR(clk));
|
||||
goto error;
|
||||
}
|
||||
|
||||
|
Viittaa uudesa ongelmassa
Block a user