From: Nicholas Krause Date: Wed, 20 May 2015 19:32:26 +0000 (-0400) Subject: mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c X-Git-Tag: Ubuntu-5.13.0-19.19~17737^2~4^2~1 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e44be50cba8b29f373bb8d744e91eaa30c4dd178;p=mirror_ubuntu-jammy-kernel.git mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c This removes the deprecacted marco, PTR_RET and changes the functions that use this marco in their return statement to instead use the non deprecacted function, PTR_ERR_OR_ZERO for the file devices.c. Signed-off-by: Nicholas Krause Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 990338fbaa59..a69bd67e9028 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -63,7 +63,7 @@ static int __init omap3_l3_init(void) WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name); - return PTR_RET(pdev); + return PTR_ERR_OR_ZERO(pdev); } omap_postcore_initcall(omap3_l3_init); @@ -333,6 +333,6 @@ static int __init omap_gpmc_init(void) pdev = omap_device_build("omap-gpmc", -1, oh, NULL, 0); WARN(IS_ERR(pdev), "could not build omap_device for %s\n", oh_name); - return PTR_RET(pdev); + return PTR_ERR_OR_ZERO(pdev); } omap_postcore_initcall(omap_gpmc_init);