summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/pmu.c
diff options
context:
space:
mode:
authorNicholas Krause <xerofoify@gmail.com>2015-05-10 07:57:34 +0300
committerTony Lindgren <tony@atomide.com>2015-05-20 20:43:37 +0300
commit87a2028f2329b8f091046316ee1910b97d3854b1 (patch)
tree666b042a47604df6dd91255a67e15e8cf3bdbb95 /arch/arm/mach-omap2/pmu.c
parent8297955f3bd44b7b5a69549ed95e851b473bb675 (diff)
downloadlinux-87a2028f2329b8f091046316ee1910b97d3854b1.tar.xz
ARM: OMAP2+: Remove calls to deprecacted marco,PTR_RET in the files,fb.c and pmu.c
This removes two calls to the deprecated marco,PTR_RET in the files,fb.c and pmu.c for the functions,omap_init_vrfb and omap_init_pmu respectfully. Furthermore these are now replaced by calling the correctly non deprecacted function, PTR_ERR_OR_ZERO in both functions. Signed-off-by: Nicholas Krause <xerofoify@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/pmu.c')
-rw-r--r--arch/arm/mach-omap2/pmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c
index a69e9a33cb6d..d2adfebd3b3f 100644
--- a/arch/arm/mach-omap2/pmu.c
+++ b/arch/arm/mach-omap2/pmu.c
@@ -55,7 +55,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);
- return PTR_RET(omap_pmu_dev);
+ return PTR_ERR_OR_ZERO(omap_pmu_dev);
}
static int __init omap_init_pmu(void)