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

Commit 1261674a authored by Thomas Meyer's avatar Thomas Meyer Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Cocci spatch "ptr_ret.spatch" 



Cocci spatch "ptr_ret.spatch"

Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Acked-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 9847bd48

arch/arm/mach-omap2/devices.c

+2 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static int __init omap3_l3_init(void) 


	WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);



	return IS_ERR(pdev) ? PTR_ERR(pdev) : 0;

	return PTR_RET(pdev);

}

omap_postcore_initcall(omap3_l3_init);
@@ -100,7 +100,7 @@ static int __init omap4_l3_init(void) 


	WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);



	return IS_ERR(pdev) ? PTR_ERR(pdev) : 0;

	return PTR_RET(pdev);

}

omap_postcore_initcall(omap4_l3_init);

arch/arm/mach-omap2/fb.c

+1 −4
Original line number Diff line number Diff line
@@ -83,10 +83,7 @@ static int __init omap_init_vrfb(void) 
	pdev = platform_device_register_resndata(NULL, "omapvrfb", -1,

			res, num_res, NULL, 0);



	if (IS_ERR(pdev))

		return PTR_ERR(pdev);

	else

		return 0;

	return PTR_RET(pdev);

}



omap_arch_initcall(omap_init_vrfb);

arch/arm/mach-omap2/gpmc.c

+1 −1
Original line number Diff line number Diff line
@@ -1734,7 +1734,7 @@ static int __init omap_gpmc_init(void) 
	pdev = omap_device_build(DEVICE_NAME, -1, oh, NULL, 0);

	WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name);



	return IS_ERR(pdev) ? PTR_ERR(pdev) : 0;

	return PTR_RET(pdev);

}

omap_postcore_initcall(omap_gpmc_init);

arch/arm/mach-omap2/pmu.c

+1 −4
Original line number Diff line number Diff line
@@ -54,10 +54,7 @@ static int __init omap2_init_pmu(unsigned oh_num, char *oh_names[]) 
	WARN(IS_ERR(omap_pmu_dev), "Can't build omap_device for %s.\n",

	     dev_name);



	if (IS_ERR(omap_pmu_dev))

		return PTR_ERR(omap_pmu_dev);



	return 0;

	return PTR_RET(omap_pmu_dev);

}



static int __init omap_init_pmu(void)