Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 617e534d authored by Stephen Boyd's avatar Stephen Boyd
Browse files

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
parents d6185e81 1f7e655c

drivers/clk/clk-stm32f4.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1424,7 +1424,7 @@ static void __init stm32f4_rcc_init(struct device_node *np) 




	base = of_iomap(np, 0);

	base = of_iomap(np, 0);

	if (!base) {

	if (!base) {

		pr_err("%s: unable to map resource", np->name);

		pr_err("%s: unable to map resource\n", np->name);

		return;

		return;

	}

	}

drivers/clk/h8300/clk-div.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -24,13 +24,13 @@ static void __init h8300_div_clk_setup(struct device_node *node) 




	num_parents = of_clk_get_parent_count(node);

	num_parents = of_clk_get_parent_count(node);

	if (!num_parents) {

	if (!num_parents) {

		pr_err("%s: no parent found", clk_name);

		pr_err("%s: no parent found\n", clk_name);

		return;

		return;

	}

	}





	divcr = of_iomap(node, 0);

	divcr = of_iomap(node, 0);

	if (divcr == NULL) {

	if (divcr == NULL) {

		pr_err("%s: failed to map divide register", clk_name);

		pr_err("%s: failed to map divide register\n", clk_name);

		goto error;

		goto error;

	}

	}

	offset = (unsigned long)divcr & 3;

	offset = (unsigned long)divcr & 3;

drivers/clk/h8300/clk-h8s2678.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ static void __init h8s2678_pll_clk_setup(struct device_node *node) 




	num_parents = of_clk_get_parent_count(node);

	num_parents = of_clk_get_parent_count(node);

	if (!num_parents) {

	if (!num_parents) {

		pr_err("%s: no parent found", clk_name);

		pr_err("%s: no parent found\n", clk_name);

		return;

		return;

	}

	}
@@ -104,13 +104,13 @@ static void __init h8s2678_pll_clk_setup(struct device_node *node) 




	pll_clock->sckcr = of_iomap(node, 0);

	pll_clock->sckcr = of_iomap(node, 0);

	if (pll_clock->sckcr == NULL) {

	if (pll_clock->sckcr == NULL) {

		pr_err("%s: failed to map divide register", clk_name);

		pr_err("%s: failed to map divide register\n", clk_name);

		goto free_clock;

		goto free_clock;

	}

	}





	pll_clock->pllcr = of_iomap(node, 1);

	pll_clock->pllcr = of_iomap(node, 1);

	if (pll_clock->pllcr == NULL) {

	if (pll_clock->pllcr == NULL) {

		pr_err("%s: failed to map multiply register", clk_name);

		pr_err("%s: failed to map multiply register\n", clk_name);

		goto unmap_sckcr;

		goto unmap_sckcr;

	}

	}

drivers/clk/nxp/clk-lpc32xx.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -526,7 +526,7 @@ static unsigned long clk_pll_recalc_rate(struct clk_hw *hw, 
	    !(pll_is_valid(parent_rate, 1, 1000000, 20000000)

	    !(pll_is_valid(parent_rate, 1, 1000000, 20000000)

	      && pll_is_valid(cco_rate, 1, 156000000, 320000000)

	      && pll_is_valid(cco_rate, 1, 156000000, 320000000)

	      && pll_is_valid(ref_rate, 1, 1000000, 27000000)))

	      && pll_is_valid(ref_rate, 1, 1000000, 27000000)))

		pr_err("%s: PLL clocks are not in valid ranges: %lu/%lu/%lu",

		pr_err("%s: PLL clocks are not in valid ranges: %lu/%lu/%lu\n",

		       clk_hw_get_name(hw),

		       clk_hw_get_name(hw),

		       parent_rate, cco_rate, ref_rate);

		       parent_rate, cco_rate, ref_rate);
@@ -1505,7 +1505,7 @@ static void __init lpc32xx_clk_init(struct device_node *np) 
		return;

		return;

	}

	}

	if (clk_get_rate(clk_32k) != 32768) {

	if (clk_get_rate(clk_32k) != 32768) {

		pr_err("invalid clock rate of external 32KHz oscillator");

		pr_err("invalid clock rate of external 32KHz oscillator\n");

		return;

		return;

	}

	}

drivers/clk/spear/clk-frac-synth.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -131,7 +131,7 @@ struct clk *clk_register_frac(const char *name, const char *parent_name, 
	struct clk *clk;

	struct clk *clk;





	if (!name || !parent_name || !reg || !rtbl || !rtbl_cnt) {

	if (!name || !parent_name || !reg || !rtbl || !rtbl_cnt) {

		pr_err("Invalid arguments passed");

		pr_err("Invalid arguments passed\n");

		return ERR_PTR(-EINVAL);

		return ERR_PTR(-EINVAL);

	}

	}