From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754821AbbI3Il2 (ORCPT ); Wed, 30 Sep 2015 04:41:28 -0400 Received: from mail-wi0-f174.google.com ([209.85.212.174]:36375 "EHLO mail-wi0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754095AbbI3IlY (ORCPT ); Wed, 30 Sep 2015 04:41:24 -0400 Date: Wed, 30 Sep 2015 10:44:18 +0200 From: Daniel Vetter To: Julia Lawall Cc: Daniel Vetter , David Airlie , 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 Message-ID: <20150930084418.GC3383@phenom.ffwll.local> Mail-Followup-To: Julia Lawall , Daniel Vetter , David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, sergey.senozhatsky@gmail.com References: <1442146532-9100-1-git-send-email-Julia.Lawall@lip6.fr> <1442146532-9100-33-git-send-email-Julia.Lawall@lip6.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1442146532-9100-33-git-send-email-Julia.Lawall@lip6.fr> X-Operating-System: Linux phenom 4.1.0-2-amd64 User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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/) > > // > @@ expression x; @@ > -if (x != NULL) > \(kmem_cache_destroy\|mempool_destroy\|dma_pool_destroy\)(x); > // > > Signed-off-by: Julia Lawall 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