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

Commit 8c6ffba0 authored by Rusty Russell's avatar Rusty Russell
Browse files

PTR_RET is now PTR_ERR_OR_ZERO(): Replace most. 



Sweep of the simple cases.

Cc: netdev@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 6e8b8726

arch/arm/mach-omap2/i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *i2c_pdata, 
				 sizeof(struct omap_i2c_bus_platform_data));

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



	return PTR_RET(pdev);

	return PTR_ERR_OR_ZERO(pdev);

}



static  int __init omap_i2c_cmdline(void)

arch/m68k/amiga/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int __init amiga_init_bus(void) 
	n = AMIGAHW_PRESENT(ZORRO3) ? 4 : 2;

	pdev = platform_device_register_simple("amiga-zorro", -1,

					       zorro_resources, n);

	return PTR_RET(pdev);

	return PTR_ERR_OR_ZERO(pdev);

}



subsys_initcall(amiga_init_bus);

arch/m68k/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static int __init rtc_init(void) 
		return -ENODEV;



	pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);

	return PTR_RET(pdev);

	return PTR_ERR_OR_ZERO(pdev);

}



module_init(rtc_init);

arch/m68k/q40/config.c

+1 −1
Original line number Diff line number Diff line
@@ -338,6 +338,6 @@ static __init int q40_add_kbd_device(void) 
		return -ENODEV;



	pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);

	return PTR_RET(pdev);

	return PTR_ERR_OR_ZERO(pdev);

}

arch_initcall(q40_add_kbd_device);

arch/powerpc/kernel/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int __init fail_iommu_debugfs(void) 
	struct dentry *dir = fault_create_debugfs_attr("fail_iommu",

						       NULL, &fail_iommu);



	return PTR_RET(dir);

	return PTR_ERR_OR_ZERO(dir);

}

late_initcall(fail_iommu_debugfs);