linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c
Date: Wed, 20 May 2015 13:55:03 -0700	[thread overview]
Message-ID: <20150520205503.GN10274@atomide.com> (raw)
In-Reply-To: <1432150346-31590-1-git-send-email-xerofoify@gmail.com>

* Nicholas Krause <xerofoify@gmail.com> [150520 12:33]:
> 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>

Applying into omap-for-v4.2/cleanup thanks.

Tony

> ---
>  arch/arm/mach-omap2/devices.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
> index 990338f..a69bd67 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);
> -- 
> 2.1.4
> 

      reply	other threads:[~2015-05-20 20:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-20 19:32 [PATCH] mach-omap2: Remove use of deprecated marco, PTR_RET in devices.c Nicholas Krause
2015-05-20 20:55 ` 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=20150520205503.GN10274@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).