Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1235904
| From | Daniel Vetter <daniel@ffwll.ch> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [Intel-gfx] [PATCH 32/39] drm: i915: drop null test before destroy functions |
| Date | 2015-09-30 10:50 +0200 |
| Message-ID | <qelfj-8h1-9@gated-at.bofh.it> (permalink) |
| References | <q8ezT-7xJ-3@gated-at.bofh.it> <q8ezV-7xJ-31@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next | Find similar | Unroll thread
Re: [Intel-gfx] [PATCH 32/39] drm: i915: drop null test before destroy functions Daniel Vetter <daniel@ffwll.ch> - 2015-09-30 10:50 +0200
csiph-web