diff options
author | Julia Lawall <Julia.Lawall@lip6.fr> | 2015-09-13 08:15:25 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-09-30 04:44:08 -0400 |
commit | 76b1cf211cbe120a2d6c46403abc97d4376c619e (patch) | |
tree | 15a1f13988ac9466c00948ab687263e7166567f0 | |
parent | 5507faeb03f87f952373314b21741548421a6944 (diff) |
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>
-rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index 817b05ce8dd3..ae1ba47e4ef0 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
@@ -1074,12 +1074,9 @@ out_freecsr: | |||
1074 | put_bridge: | 1074 | put_bridge: |
1075 | pci_dev_put(dev_priv->bridge_dev); | 1075 | pci_dev_put(dev_priv->bridge_dev); |
1076 | free_priv: | 1076 | free_priv: |
1077 | if (dev_priv->requests) | 1077 | kmem_cache_destroy(dev_priv->requests); |
1078 | kmem_cache_destroy(dev_priv->requests); | 1078 | kmem_cache_destroy(dev_priv->vmas); |
1079 | if (dev_priv->vmas) | 1079 | kmem_cache_destroy(dev_priv->objects); |
1080 | kmem_cache_destroy(dev_priv->vmas); | ||
1081 | if (dev_priv->objects) | ||
1082 | kmem_cache_destroy(dev_priv->objects); | ||
1083 | kfree(dev_priv); | 1080 | kfree(dev_priv); |
1084 | return ret; | 1081 | return ret; |
1085 | } | 1082 | } |
@@ -1170,13 +1167,9 @@ int i915_driver_unload(struct drm_device *dev) | |||
1170 | if (dev_priv->regs != NULL) | 1167 | if (dev_priv->regs != NULL) |
1171 | pci_iounmap(dev->pdev, dev_priv->regs); | 1168 | pci_iounmap(dev->pdev, dev_priv->regs); |
1172 | 1169 | ||
1173 | if (dev_priv->requests) | 1170 | kmem_cache_destroy(dev_priv->requests); |
1174 | kmem_cache_destroy(dev_priv->requests); | 1171 | kmem_cache_destroy(dev_priv->vmas); |
1175 | if (dev_priv->vmas) | 1172 | kmem_cache_destroy(dev_priv->objects); |
1176 | kmem_cache_destroy(dev_priv->vmas); | ||
1177 | if (dev_priv->objects) | ||
1178 | kmem_cache_destroy(dev_priv->objects); | ||
1179 | |||
1180 | pci_dev_put(dev_priv->bridge_dev); | 1173 | pci_dev_put(dev_priv->bridge_dev); |
1181 | kfree(dev_priv); | 1174 | kfree(dev_priv); |
1182 | 1175 | ||