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

Commit f33aadd2 authored by Markus Elfring's avatar Markus Elfring Committed by Tony Lindgren
Browse files

ARM: OMAP3: Use common error handling code in omap3xxx_hwmod_init() 



Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d25c70cf

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+8 −8
Original line number Diff line number Diff line
@@ -3208,18 +3208,14 @@ int __init omap3xxx_hwmod_init(void) 


	if (h_sham && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "sham")) {

		r = omap_hwmod_register_links(h_sham);

		if (r < 0) {

			of_node_put(bus);

			return r;

		}

		if (r < 0)

			goto put_node;

	}



	if (h_aes && omap3xxx_hwmod_is_hs_ip_block_usable(bus, "aes")) {

		r = omap_hwmod_register_links(h_aes);

		if (r < 0) {

			of_node_put(bus);

			return r;

		}

		if (r < 0)

			goto put_node;

	}

	of_node_put(bus);
@@ -3270,4 +3266,8 @@ int __init omap3xxx_hwmod_init(void) 
	r = omap_hwmod_register_links(omap3xxx_dss_hwmod_ocp_ifs);



	return r;



put_node:

	of_node_put(bus);

	return r;

}