[PATCH 31/42] staging: comedi: ni_mio_common: ni_gpct_device_destroy() can handle a NULL pointer

Ian Abbott abbotti at mev.co.uk
Mon Mar 21 15:12:40 UTC 2016


On 18/03/16 19:39, H Hartley Sweeten wrote:
> Remove the unnecessary NULL pointer check.
>
> Signed-off-by: H Hartley Sweeten <hsweeten at visionengravers.com>
> Cc: Ian Abbott <abbotti at mev.co.uk>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> ---
>   drivers/staging/comedi/drivers/ni_mio_common.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
> index dcaf7e8..71c8fd2 100644
> --- a/drivers/staging/comedi/drivers/ni_mio_common.c
> +++ b/drivers/staging/comedi/drivers/ni_mio_common.c
> @@ -5675,8 +5675,6 @@ static void mio_common_detach(struct comedi_device *dev)
>   {
>   	struct ni_private *devpriv = dev->private;
>
> -	if (devpriv) {
> -		if (devpriv->counter_dev)
> -			ni_gpct_device_destroy(devpriv->counter_dev);
> -	}
> +	if (devpriv)
> +		ni_gpct_device_destroy(devpriv->counter_dev);
>   }
>

Ditto about ni_gpct_device_destroy() breakage.

-- 
-=( Ian Abbott @ MEV Ltd.    E-mail: <abbotti at mev.co.uk> )=-
-=(                          Web: http://www.mev.co.uk/  )=-


More information about the devel mailing list