Commit 698f140d authored by Markus Elfring's avatar Markus Elfring Committed by Greg Kroah-Hartman
Browse files

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: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 74ed42c7

drivers/staging/android/ion/ion.c

+2 −4
Original line number Diff line number Diff line
@@ -263,7 +263,6 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap, 
	heap->ops->unmap_dma(heap, buffer);

	heap->ops->free(buffer);

err1:

	if (buffer->pages)

	vfree(buffer->pages);

err2:

	kfree(buffer);
@@ -276,7 +275,6 @@ 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);

	kfree(buffer);

}

drivers/staging/android/ion/ion_dummy_driver.c

+2 −4
Original line number Diff line number Diff line
@@ -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])

	for (i = 0; i < dummy_ion_pdata.nr; ++i)

		ion_heap_destroy(heaps[i]);

	}

	kfree(heaps);



	if (carveout_ptr) {

drivers/staging/android/ion/tegra/tegra_ion.c

+2 −4
Original line number Diff line number Diff line
@@ -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])

	for (i = 0; i < num_heaps; ++i)

		ion_heap_destroy(heaps[i]);

	}

	return err;

}