[media] platform: Deletion of unnecessary checks before two function calls

The functions i2c_put_adapter() and release_firmware() test whether their
argument is NULL and then return immediately. 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: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c
index 3d49ce03b176472a0176bc8863b649d8d710bbf8..2a0cbeff032467e5a3b46838123c3e440000ae18 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/exynos4-is/fimc-is.c
@@ -428,8 +428,7 @@ static void fimc_is_load_firmware(const struct firmware *fw, void *context)
         * needed around for copying to the IS working memory every
         * time before the Cortex-A5 is restarted.
         */
-       if (is->fw.f_w)
-               release_firmware(is->fw.f_w);
+       release_firmware(is->fw.f_w);
        is->fw.f_w = fw;
 done:
        mutex_unlock(&is->lock);
@@ -937,8 +936,7 @@ static int fimc_is_remove(struct platform_device *pdev)
        vb2_dma_contig_cleanup_ctx(is->alloc_ctx);
        fimc_is_put_clocks(is);
        fimc_is_debugfs_remove(is);
-       if (is->fw.f_w)
-               release_firmware(is->fw.f_w);
+       release_firmware(is->fw.f_w);
        fimc_is_free_cpu_memory(is);
 
        return 0;

diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c
index b38574702fe9eb50ae3b523af5111df2628b3763..3b09b5b6ad51459c4c104a8f06b26118bd17d9b9 100644 (file)
--- a/drivers/media/platform/s3c-camif/camif-core.c
+++ b/drivers/media/platform/s3c-camif/camif-core.c
@@ -256,8 +256,7 @@ static void camif_unregister_sensor(struct camif_dev *camif)
        v4l2_device_unregister_subdev(sd);
        camif->sensor.sd = NULL;
        i2c_unregister_device(client);
-       if (adapter)
-               i2c_put_adapter(adapter);
+       i2c_put_adapter(adapter);
 }
 
 static int camif_create_media_links(struct camif_dev *camif)