diff options
| author | Nicholas Krause <xerofoify@gmail.com> | 2015-05-20 15:32:26 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-05-20 13:54:35 -0700 |
| commit | e44be50cba8b29f373bb8d744e91eaa30c4dd178 (patch) | |
| tree | a267b7b89e628d807c08de0c9e173f64761723e4 | |
| parent | 87a2028f2329b8f091046316ee1910b97d3854b1 (diff) | |
| download | linux-e44be50cba8b29f373bb8d744e91eaa30c4dd178.tar.bz2 | |
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 <xerofoify@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |