Commit 883f464c authored by Wang Qing's avatar Wang Qing Committed by Tony Lindgren
Browse files

ARM: OMAP2+: add missing of_node_put before break and return 



Fix following coccicheck warning:
WARNING: Function "for_each_matching_node_and_match"
should have of_node_put() before return.

Early exits from for_each_matching_node_and_match should decrement the
node reference counter.

Signed-off-by: default avatarWang Qing <wangqing@vivo.com>
Message-Id: <1639388545-63615-1-git-send-email-wangqing@vivo.com>
[tony@atomide.com: updated for omap_hwmod.c that was already patched]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 71ff461c

arch/arm/mach-omap2/cm_common.c

+6 −2
Original line number Diff line number Diff line
@@ -320,8 +320,10 @@ int __init omap2_cm_base_init(void) 
		data = (struct omap_prcm_init_data *)match->data;



		ret = of_address_to_resource(np, 0, &res);

		if (ret)

		if (ret) {

			of_node_put(np);

			return ret;

		}



		if (data->index == TI_CLKM_CM)

			mem = &cm_base;
@@ -367,9 +369,11 @@ int __init omap_cm_init(void) 
			continue;



		ret = omap2_clk_provider_init(np, data->index, NULL, data->mem);

		if (ret)

		if (ret) {

			of_node_put(np);

			return ret;

		}

	}



	return 0;

}

arch/arm/mach-omap2/control.c

+14 −5
Original line number Diff line number Diff line
@@ -769,8 +769,10 @@ int __init omap2_control_base_init(void) 
		data = (struct control_init_data *)match->data;



		mem = of_iomap(np, 0);

		if (!mem)

		if (!mem) {

			of_node_put(np);

			return -ENOMEM;

		}



		if (data->index == TI_CLKM_CTRL) {

			omap2_ctrl_base = mem;
@@ -810,22 +812,24 @@ int __init omap_control_init(void) 
		if (scm_conf) {

			syscon = syscon_node_to_regmap(scm_conf);



			if (IS_ERR(syscon))

				return PTR_ERR(syscon);

			if (IS_ERR(syscon)) {

				ret = PTR_ERR(syscon);

				goto of_node_put;

			}



			if (of_get_child_by_name(scm_conf, "clocks")) {

				ret = omap2_clk_provider_init(scm_conf,

							      data->index,

							      syscon, NULL);

				if (ret)

					return ret;

					goto of_node_put;

			}

		} else {

			/* No scm_conf found, direct access */

			ret = omap2_clk_provider_init(np, data->index, NULL,

						      data->mem);

			if (ret)

				return ret;

				goto of_node_put;

		}

	}
@@ -836,6 +840,11 @@ int __init omap_control_init(void) 
	}



	return 0;



of_node_put:

	of_node_put(np);

	return ret;



}



/**

arch/arm/mach-omap2/prm_common.c

+6 −2
Original line number Diff line number Diff line
@@ -752,8 +752,10 @@ int __init omap2_prm_base_init(void) 
		data = (struct omap_prcm_init_data *)match->data;



		ret = of_address_to_resource(np, 0, &res);

		if (ret)

		if (ret) {

			of_node_put(np);

			return ret;

		}



		data->mem = ioremap(res.start, resource_size(&res));
@@ -799,9 +801,11 @@ int __init omap_prcm_init(void) 
		data = match->data;



		ret = omap2_clk_provider_init(np, data->index, NULL, data->mem);

		if (ret)

		if (ret) {

			of_node_put(np);

			return ret;

		}

	}



	omap_cm_init();