public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: William Breathitt Gray <vilhelm.gray@gmail.com>
To: Dan Carpenter <dan.carpenter@oracle.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	"Jonathan Cameron" <Jonathan.Cameron@huawei.com>,
	linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
	kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v2] counter: fix an IS_ERR() vs NULL bug
Date: Wed, 12 Jan 2022 07:48:53 +0900	[thread overview]
Message-ID: <Yd4JVSTUcFVFNhaJ@shinobu> (raw)
In-Reply-To: <20220111173243.GA2192@kili>

[-- Attachment #1: Type: text/plain, Size: 1913 bytes --]

On Tue, Jan 11, 2022 at 08:32:43PM +0300, Dan Carpenter wrote:
> There are 8 callers for devm_counter_alloc() and they all check for NULL
> instead of error pointers.  I think NULL is the better thing to return
> for allocation functions so update counter_alloc() and devm_counter_alloc()
> to return NULL instead of error pointers.
> 
> Fixes: c18e2760308e ("counter: Provide alternative counter registration functions")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: William Breathitt Gray <vilhelm.gray@gmail.com>

> ---
> v2: make additional style changes
> 
>  drivers/counter/counter-core.c | 15 ++++++---------
>  1 file changed, 6 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/counter/counter-core.c b/drivers/counter/counter-core.c
> index 7e0957eea094..869894b74741 100644
> --- a/drivers/counter/counter-core.c
> +++ b/drivers/counter/counter-core.c
> @@ -90,10 +90,8 @@ struct counter_device *counter_alloc(size_t sizeof_priv)
>  	int err;
>  
>  	ch = kzalloc(sizeof(*ch) + sizeof_priv, GFP_KERNEL);
> -	if (!ch) {
> -		err = -ENOMEM;
> -		goto err_alloc_ch;
> -	}
> +	if (!ch)
> +		return NULL;
>  
>  	counter = &ch->counter;
>  	dev = &counter->dev;
> @@ -123,9 +121,8 @@ struct counter_device *counter_alloc(size_t sizeof_priv)
>  err_ida_alloc:
>  
>  	kfree(ch);
> -err_alloc_ch:
>  
> -	return ERR_PTR(err);
> +	return NULL;
>  }
>  EXPORT_SYMBOL_GPL(counter_alloc);
>  
> @@ -208,12 +205,12 @@ struct counter_device *devm_counter_alloc(struct device *dev, size_t sizeof_priv
>  	int err;
>  
>  	counter = counter_alloc(sizeof_priv);
> -	if (IS_ERR(counter))
> -		return counter;
> +	if (!counter)
> +		return NULL;
>  
>  	err = devm_add_action_or_reset(dev, devm_counter_put, counter);
>  	if (err < 0)
> -		return ERR_PTR(err);
> +		return NULL;
>  
>  	return counter;
>  }
> -- 
> 2.20.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

      parent reply	other threads:[~2022-01-11 22:49 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-11 17:32 [PATCH v2] counter: fix an IS_ERR() vs NULL bug Dan Carpenter
2022-01-11 20:33 ` Uwe Kleine-König
2022-01-11 22:48 ` William Breathitt Gray [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=Yd4JVSTUcFVFNhaJ@shinobu \
    --to=vilhelm.gray@gmail.com \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=dan.carpenter@oracle.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=u.kleine-koenig@pengutronix.de \
    /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