Skip to content

Commit

Permalink
mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicholas Krause authored and Tony Lindgren committed May 20, 2015
1 parent 87a2028 commit e44be50
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/arm/mach-omap2/devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

0 comments on commit e44be50

Please sign in to comment.