staging: android: ion: Deletion of unnecessary checks before two function calls

The functions ion_heap_destroy() and vfree() perform also input
parameter validation. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 8724ef89ce94dbe7d60c0d8b2e5592c3da0437fa..296d347660fc090515ed4c5e3e95ad2f37b5dcb4 100644 (file)
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -263,8 +263,7 @@ err:
        heap->ops->unmap_dma(heap, buffer);
        heap->ops->free(buffer);
 err1:
-       if (buffer->pages)
-               vfree(buffer->pages);
+       vfree(buffer->pages);
 err2:
        kfree(buffer);
        return ERR_PTR(ret);
@@ -276,8 +275,7 @@ void ion_buffer_destroy(struct ion_buffer *buffer)
                buffer->heap->ops->unmap_kernel(buffer->heap, buffer);
        buffer->heap->ops->unmap_dma(buffer->heap, buffer);
        buffer->heap->ops->free(buffer);
-       if (buffer->pages)
-               vfree(buffer->pages);
+       vfree(buffer->pages);
        kfree(buffer);
 }
 

diff --git a/drivers/staging/android/ion/ion_dummy_driver.c b/drivers/staging/android/ion/ion_dummy_driver.c
index f3ea1c31e533920fa244c1ef9b829e73a8eb834a..5678870bff4850cbdf53eff4d58cc29b7df84434 100644 (file)
--- a/drivers/staging/android/ion/ion_dummy_driver.c
+++ b/drivers/staging/android/ion/ion_dummy_driver.c
@@ -112,10 +112,8 @@ static int __init ion_dummy_init(void)
        }
        return 0;
 err:
-       for (i = 0; i < dummy_ion_pdata.nr; i++) {
-               if (heaps[i])
-                       ion_heap_destroy(heaps[i]);
-       }
+       for (i = 0; i < dummy_ion_pdata.nr; ++i)
+               ion_heap_destroy(heaps[i]);
        kfree(heaps);
 
        if (carveout_ptr) {

diff --git a/drivers/staging/android/ion/tegra/tegra_ion.c b/drivers/staging/android/ion/tegra/tegra_ion.c
index 11c7cceb3c7d52f89f6cd99372d3a656aeeec0b5..5b8ef0e66010e4e704b85f0ffbf20cec236b8f80 100644 (file)
--- a/drivers/staging/android/ion/tegra/tegra_ion.c
+++ b/drivers/staging/android/ion/tegra/tegra_ion.c
@@ -54,10 +54,8 @@ static int tegra_ion_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, idev);
        return 0;
 err:
-       for (i = 0; i < num_heaps; i++) {
-               if (heaps[i])
-                       ion_heap_destroy(heaps[i]);
-       }
+       for (i = 0; i < num_heaps; ++i)
+               ion_heap_destroy(heaps[i]);
        return err;
 }