mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: Julia Lawall <Julia.Lawall@lip6.fr>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
	David Airlie <airlied@linux.ie>,
	intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	sergey.senozhatsky@gmail.com
Subject: Re: [Intel-gfx] [PATCH 32/39] drm: i915: drop null test before destroy functions
Date: Wed, 30 Sep 2015 10:44:18 +0200	[thread overview]
Message-ID: <20150930084418.GC3383@phenom.ffwll.local> (raw)
In-Reply-To: <1442146532-9100-33-git-send-email-Julia.Lawall@lip6.fr>

On Sun, Sep 13, 2015 at 02:15:25PM +0200, Julia Lawall wrote:
> Remove unneeded NULL test.
> 
> The semantic patch that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
> 
> // <smpl>
> @@ expression x; @@
> -if (x != NULL)
>   \(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x);
> // </smpl>
> 
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>

Queued for -next, thanks for the patch.
-Daniel

> 
> ---
>  drivers/gpu/drm/i915/i915_dma.c |   19 ++++++-------------
>  1 file changed, 6 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index ab37d11..1dc7c21 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1059,12 +1059,9 @@ out_freecsr:
>  put_bridge:
>  	pci_dev_put(dev_priv->bridge_dev);
>  free_priv:
> -	if (dev_priv->requests)
> -		kmem_cache_destroy(dev_priv->requests);
> -	if (dev_priv->vmas)
> -		kmem_cache_destroy(dev_priv->vmas);
> -	if (dev_priv->objects)
> -		kmem_cache_destroy(dev_priv->objects);
> +	kmem_cache_destroy(dev_priv->requests);
> +	kmem_cache_destroy(dev_priv->vmas);
> +	kmem_cache_destroy(dev_priv->objects);
>  	kfree(dev_priv);
>  	return ret;
>  }
> @@ -1150,13 +1147,9 @@ int i915_driver_unload(struct drm_device *dev)
>  	if (dev_priv->regs != NULL)
>  		pci_iounmap(dev->pdev, dev_priv->regs);
>  
> -	if (dev_priv->requests)
> -		kmem_cache_destroy(dev_priv->requests);
> -	if (dev_priv->vmas)
> -		kmem_cache_destroy(dev_priv->vmas);
> -	if (dev_priv->objects)
> -		kmem_cache_destroy(dev_priv->objects);
> -
> +	kmem_cache_destroy(dev_priv->requests);
> +	kmem_cache_destroy(dev_priv->vmas);
> +	kmem_cache_destroy(dev_priv->objects);
>  	pci_dev_put(dev_priv->bridge_dev);
>  	kfree(dev_priv);
>  
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

  reply	other threads:[~2015-09-30  8:41 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-13 12:14 [PATCH 00/39] " Julia Lawall
2015-09-13 12:14 ` [PATCH 01/39] mtd: nandsim: " Julia Lawall
2015-09-22  0:07   ` Brian Norris
2015-09-13 12:14 ` [PATCH 02/39] nilfs2: " Julia Lawall
2015-09-14  3:29   ` Ryusuke Konishi
2015-09-13 12:14 ` [PATCH 03/39] firmware: google: " Julia Lawall
2015-09-13 12:14 ` [PATCH 04/39] debugobjects: " Julia Lawall
2015-09-13 12:14 ` [PATCH 05/39] xhci: " Julia Lawall
2015-09-13 12:14 ` [PATCH 06/39] Btrfs: " Julia Lawall
2015-09-14 20:43   ` David Sterba
2015-09-13 12:15 ` [PATCH 07/39] fs: ext4: " Julia Lawall
2015-09-13 12:15 ` [PATCH 08/39] pktcdvd: " Julia Lawall
2015-09-29 13:02   ` Jiri Kosina
2015-09-13 12:15 ` [PATCH 09/39] aoe: " Julia Lawall
2015-09-15  1:39   ` Ed Cashin
2015-09-13 12:15 ` [PATCH 10/39] atm: he: " Julia Lawall
2015-09-15 23:50   ` David Miller
2015-09-13 12:15 ` [PATCH 11/39] hfi1: " Julia Lawall
2015-09-15 13:56   ` Marciniszyn, Mike
2015-09-13 12:15 ` [PATCH 12/39] dm: " Julia Lawall
2015-09-14 13:46   ` [dm-devel] " Mikulas Patocka
2015-09-14 14:00     ` Mike Snitzer
2015-09-14 14:05       ` Mikulas Patocka
2015-09-14 18:50         ` Julia Lawall
2015-09-14 14:23     ` [dm-devel] " walter harms
2015-09-13 12:15 ` [PATCH 13/39] staging: lustre: " Julia Lawall
2015-09-13 12:15 ` [PATCH 14/39] SUNRPC: " Julia Lawall
2015-09-14 16:07   ` J. Bruce Fields
2015-09-14 16:25     ` Trond Myklebust
2015-09-13 12:15 ` [PATCH 15/39] bcache: " Julia Lawall
2015-09-14  9:08   ` Johannes Thumshirn
2015-09-13 12:15 ` [PATCH 16/39] usb: gadget: " Julia Lawall
2015-09-13 12:15 ` [PATCH 17/39] md: " Julia Lawall
2015-09-15  7:29   ` Neil Brown
2015-09-13 12:15 ` [PATCH 18/39] whci: " Julia Lawall
2015-09-13 12:15 ` [PATCH 19/39] jbd2: " Julia Lawall
2015-09-13 12:15 ` [PATCH 20/39] ixgbe: " Julia Lawall
2015-09-13 12:15 ` [PATCH 21/39] drbd: " Julia Lawall
2015-09-13 12:15 ` [PATCH 22/39] nfsd: " Julia Lawall
2015-09-14 16:06   ` J. Bruce Fields
2015-09-13 12:15 ` [PATCH 23/39] UBI: " Julia Lawall
2015-10-03 18:36   ` Richard Weinberger
2015-09-13 12:15 ` [PATCH 24/39] dlm: " Julia Lawall
2015-09-13 12:15 ` [PATCH 25/39] net: core: " Julia Lawall
2015-09-15 23:50   ` David Miller
2015-09-13 12:15 ` [PATCH 26/39] dmaengine: " Julia Lawall
2015-09-21 17:10   ` Vinod Koul
2015-09-13 12:15 ` [PATCH 27/39] ocfs2: " Julia Lawall
2015-09-13 12:15 ` [PATCH 28/39] ecryptfs: " Julia Lawall
2015-09-15  2:08   ` Tyler Hicks
2015-09-15  4:36     ` Julia Lawall
2015-09-15 14:45       ` Tyler Hicks
2015-09-13 12:15 ` [PATCH 29/39] thunderbolt: " Julia Lawall
2015-09-13 12:15 ` [PATCH 30/39] block: " Julia Lawall
2015-09-13 12:15 ` [PATCH 31/39] KVM: MMU: " Julia Lawall
2015-09-14  8:30   ` Paolo Bonzini
2015-09-13 12:15 ` [PATCH 32/39] drm: i915: " Julia Lawall
2015-09-30  8:44   ` Daniel Vetter [this message]
2015-09-13 12:15 ` [PATCH 33/39] rbd: " Julia Lawall
2015-09-14  9:53   ` Ilya Dryomov
2015-09-13 12:15 ` [PATCH 34/39] dccp: " Julia Lawall
2015-09-15 23:50   ` David Miller
2015-09-13 12:15 ` [PATCH 35/39] GFS2: " Julia Lawall
2015-09-13 12:15 ` [PATCH 36/39] jffs2: " Julia Lawall
2015-09-13 12:15 ` [PATCH 37/39] f2fs crypto: " Julia Lawall
2015-09-16 10:17   ` Chao Yu
2015-09-13 12:15 ` [PATCH 38/39] iommu/amd: " Julia Lawall
2015-09-29 13:41   ` Joerg Roedel
2015-09-13 12:15 ` [PATCH 39/39] usb: host: " Julia Lawall
2015-09-14 11:55 ` [PATCH 00/39] " SF Markus Elfring

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=20150930084418.GC3383@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=Julia.Lawall@lip6.fr \
    --cc=airlied@linux.ie \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sergey.senozhatsky@gmail.com \
    /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
Powered by JetHome