From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] mach-omap2:Remove calls to deprecacted marco,PTR_RET in the files,fb.c and pmu.c
Date: Wed, 20 May 2015 10:43:03 -0700 [thread overview]
Message-ID: <20150520174302.GB10274@atomide.com> (raw)
In-Reply-To: <1431233854-31982-1-git-send-email-xerofoify@gmail.com>
* Nicholas Krause <xerofoify@gmail.com> [150509 21:58]:
> 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>
Applying into omap-for-v4.2/cleanup thanks.
Tony
> ---
> arch/arm/mach-omap2/fb.c | 2 +-
> arch/arm/mach-omap2/pmu.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/fb.c b/arch/arm/mach-omap2/fb.c
> index 26e28e9..1f1ecf8 100644
> --- a/arch/arm/mach-omap2/fb.c
> +++ b/arch/arm/mach-omap2/fb.c
> @@ -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; }
> diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c
> index a69e9a3..d2adfeb 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)
> --
> 2.1.4
>
prev parent reply other threads:[~2015-05-20 17:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-10 4:57 [PATCH] mach-omap2:Remove calls to deprecacted marco, PTR_RET in the files, fb.c and pmu.c Nicholas Krause
2015-05-20 17:43 ` Tony Lindgren [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150520174302.GB10274@atomide.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).