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

Commit dc75925d authored by Benoit Cousson's avatar Benoit Cousson Committed by Paul Walmsley
Browse files

OMAP: hwmod: Fix the missing braces 

As reported by Sergei, a couple of braces were missing after
the WARN removal patch.

[07/22] OMAP: hwmod: Replace WARN by pr_warning if clock lookup failed

https://patchwork.kernel.org/patch/100756/



Signed-off-by: default avatarBenoit Cousson <b-cousson@ti.com>
[paul@pwsan.com: fixed patch description per Anand's E-mail]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
Cc: Sergei Shtylyov <sshtylyov@mvista.com>
Cc: Anand Gadiyar <gadiyar@ti.com>
parent 7e27d6e7

arch/arm/mach-omap2/omap_hwmod.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -409,10 +409,11 @@ static int _init_main_clk(struct omap_hwmod *oh) 
		return 0;

		return 0;





	oh->_clk = omap_clk_get_by_name(oh->main_clk);

	oh->_clk = omap_clk_get_by_name(oh->main_clk);

	if (!oh->_clk)

	if (!oh->_clk) {

		pr_warning("omap_hwmod: %s: cannot clk_get main_clk %s\n",

		pr_warning("omap_hwmod: %s: cannot clk_get main_clk %s\n",

			   oh->name, oh->main_clk);

			   oh->name, oh->main_clk);

		return -EINVAL;

		return -EINVAL;

	}





	if (!oh->_clk->clkdm)

	if (!oh->_clk->clkdm)

		pr_warning("omap_hwmod: %s: missing clockdomain for %s.\n",

		pr_warning("omap_hwmod: %s: missing clockdomain for %s.\n",
@@ -444,10 +445,11 @@ static int _init_interface_clks(struct omap_hwmod *oh) 
			continue;

			continue;





		c = omap_clk_get_by_name(os->clk);

		c = omap_clk_get_by_name(os->clk);

		if (!c)

		if (!c) {

			pr_warning("omap_hwmod: %s: cannot clk_get interface_clk %s\n",

			pr_warning("omap_hwmod: %s: cannot clk_get interface_clk %s\n",

				   oh->name, os->clk);

				   oh->name, os->clk);

			ret = -EINVAL;

			ret = -EINVAL;

		}

		os->_clk = c;

		os->_clk = c;

	}

	}
@@ -470,10 +472,11 @@ static int _init_opt_clks(struct omap_hwmod *oh) 




	for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) {

	for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) {

		c = omap_clk_get_by_name(oc->clk);

		c = omap_clk_get_by_name(oc->clk);

		if (!c)

		if (!c) {

			pr_warning("omap_hwmod: %s: cannot clk_get opt_clk %s\n",

			pr_warning("omap_hwmod: %s: cannot clk_get opt_clk %s\n",

				   oh->name, oc->clk);

				   oh->name, oc->clk);

			ret = -EINVAL;

			ret = -EINVAL;

		}

		oc->_clk = c;

		oc->_clk = c;

	}

	}