forked from Minki/linux
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>
This commit is contained in:
parent
8297955f3b
commit
87a2028f23
@ -84,7 +84,7 @@ int __init omap_init_vrfb(void)
|
||||
pdev = platform_device_register_resndata(NULL, "omapvrfb", -1,
|
||||
res, num_res, NULL, 0);
|
||||
|
||||
return PTR_RET(pdev);
|
||||
return PTR_ERR_OR_ZERO(pdev);
|
||||
}
|
||||
#else
|
||||
int __init omap_init_vrfb(void) { return 0; }
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user