openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm: i915: drop null test before destroy functions 

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>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Julia Lawall 2015-09-13 14:15:25 +02:00 committed by Daniel Vetter
parent 5507faeb03
commit 76b1cf211c
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/i915/i915_dma.c
View File

@ -1074,12 +1074,9 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
put_bridge: put_bridge:
pci_dev_put(dev_priv->bridge_dev); pci_dev_put(dev_priv->bridge_dev);
free_priv: free_priv:
if (dev_priv->requests) kmem_cache_destroy(dev_priv->requests);
kmem_cache_destroy(dev_priv->requests); kmem_cache_destroy(dev_priv->vmas);
if (dev_priv->vmas) kmem_cache_destroy(dev_priv->objects);
kmem_cache_destroy(dev_priv->vmas);
if (dev_priv->objects)
kmem_cache_destroy(dev_priv->objects);
kfree(dev_priv); kfree(dev_priv);
return ret; return ret;
} }
@ -1170,13 +1167,9 @@ int i915_driver_unload(struct drm_device *dev)
if (dev_priv->regs != NULL) if (dev_priv->regs != NULL)
pci_iounmap(dev->pdev, dev_priv->regs); pci_iounmap(dev->pdev, dev_priv->regs);
if (dev_priv->requests) kmem_cache_destroy(dev_priv->requests);
kmem_cache_destroy(dev_priv->requests); kmem_cache_destroy(dev_priv->vmas);
if (dev_priv->vmas) kmem_cache_destroy(dev_priv->objects);
kmem_cache_destroy(dev_priv->vmas);
if (dev_priv->objects)
kmem_cache_destroy(dev_priv->objects);
pci_dev_put(dev_priv->bridge_dev); pci_dev_put(dev_priv->bridge_dev);
kfree(dev_priv); kfree(dev_priv);