[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>
This commit is contained in:
Markus Elfring 2014-11-20 07:44:20 -03:00 committed by Mauro Carvalho Chehab
parent 3dd94f00f0
commit 332b295d10
2 changed files with 3 additions and 6 deletions

View File

@ -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 * needed around for copying to the IS working memory every
* time before the Cortex-A5 is restarted. * 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; is->fw.f_w = fw;
done: done:
mutex_unlock(&is->lock); 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); vb2_dma_contig_cleanup_ctx(is->alloc_ctx);
fimc_is_put_clocks(is); fimc_is_put_clocks(is);
fimc_is_debugfs_remove(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); fimc_is_free_cpu_memory(is);
return 0; return 0;

View File

@ -256,8 +256,7 @@ static void camif_unregister_sensor(struct camif_dev *camif)
v4l2_device_unregister_subdev(sd); v4l2_device_unregister_subdev(sd);
camif->sensor.sd = NULL; camif->sensor.sd = NULL;
i2c_unregister_device(client); i2c_unregister_device(client);
if (adapter) i2c_put_adapter(adapter);
i2c_put_adapter(adapter);
} }
static int camif_create_media_links(struct camif_dev *camif) static int camif_create_media_links(struct camif_dev *camif)