Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 'clk-pr-err' into clk-next

* clk-pr-err:
clk: h8300: pr_err() strings should end with newlines
clk: h8s2678: pr_err() strings should end with newlines
SPEAr: clk: pr_err() strings should end with newlines
clk: SPEAr: pr_err() strings should end with newlines
clk: lpc32xx: pr_err() strings should end with newlines
clk: stm32f4: pr_err() strings should end with newlines

+10 -10
+1 -1
drivers/clk/clk-stm32f4.c
··· 1424 1424 1425 1425 base = of_iomap(np, 0); 1426 1426 if (!base) { 1427 - pr_err("%s: unable to map resource", np->name); 1427 + pr_err("%s: unable to map resource\n", np->name); 1428 1428 return; 1429 1429 } 1430 1430
+2 -2
drivers/clk/h8300/clk-div.c
··· 24 24 25 25 num_parents = of_clk_get_parent_count(node); 26 26 if (!num_parents) { 27 - pr_err("%s: no parent found", clk_name); 27 + pr_err("%s: no parent found\n", clk_name); 28 28 return; 29 29 } 30 30 31 31 divcr = of_iomap(node, 0); 32 32 if (divcr == NULL) { 33 - pr_err("%s: failed to map divide register", clk_name); 33 + pr_err("%s: failed to map divide register\n", clk_name); 34 34 goto error; 35 35 } 36 36 offset = (unsigned long)divcr & 3;
+3 -3
drivers/clk/h8300/clk-h8s2678.c
··· 93 93 94 94 num_parents = of_clk_get_parent_count(node); 95 95 if (!num_parents) { 96 - pr_err("%s: no parent found", clk_name); 96 + pr_err("%s: no parent found\n", clk_name); 97 97 return; 98 98 } 99 99 ··· 104 104 105 105 pll_clock->sckcr = of_iomap(node, 0); 106 106 if (pll_clock->sckcr == NULL) { 107 - pr_err("%s: failed to map divide register", clk_name); 107 + pr_err("%s: failed to map divide register\n", clk_name); 108 108 goto free_clock; 109 109 } 110 110 111 111 pll_clock->pllcr = of_iomap(node, 1); 112 112 if (pll_clock->pllcr == NULL) { 113 - pr_err("%s: failed to map multiply register", clk_name); 113 + pr_err("%s: failed to map multiply register\n", clk_name); 114 114 goto unmap_sckcr; 115 115 } 116 116
+2 -2
drivers/clk/nxp/clk-lpc32xx.c
··· 526 526 !(pll_is_valid(parent_rate, 1, 1000000, 20000000) 527 527 && pll_is_valid(cco_rate, 1, 156000000, 320000000) 528 528 && pll_is_valid(ref_rate, 1, 1000000, 27000000))) 529 - pr_err("%s: PLL clocks are not in valid ranges: %lu/%lu/%lu", 529 + pr_err("%s: PLL clocks are not in valid ranges: %lu/%lu/%lu\n", 530 530 clk_hw_get_name(hw), 531 531 parent_rate, cco_rate, ref_rate); 532 532 ··· 1505 1505 return; 1506 1506 } 1507 1507 if (clk_get_rate(clk_32k) != 32768) { 1508 - pr_err("invalid clock rate of external 32KHz oscillator"); 1508 + pr_err("invalid clock rate of external 32KHz oscillator\n"); 1509 1509 return; 1510 1510 } 1511 1511
+1 -1
drivers/clk/spear/clk-frac-synth.c
··· 131 131 struct clk *clk; 132 132 133 133 if (!name || !parent_name || !reg || !rtbl || !rtbl_cnt) { 134 - pr_err("Invalid arguments passed"); 134 + pr_err("Invalid arguments passed\n"); 135 135 return ERR_PTR(-EINVAL); 136 136 } 137 137
+1 -1
drivers/clk/spear/clk-gpt-synth.c
··· 120 120 struct clk *clk; 121 121 122 122 if (!name || !parent_name || !reg || !rtbl || !rtbl_cnt) { 123 - pr_err("Invalid arguments passed"); 123 + pr_err("Invalid arguments passed\n"); 124 124 return ERR_PTR(-EINVAL); 125 125 } 126 126