aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2014-11-23 08:07:22 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-12-04 09:16:01 -0500
commitbc500d6ed9e2f56a01a7a59d5366d4526111ba1e (patch)
tree5edc0cca3d804d710c3654421f575bd5d5c3a2e5
parent6049a7a2535bf0b5021b527e60dee9eda022bc90 (diff)
video: fbdev-OMAP2: Deletion of unnecessary checks before the function call "i2c_put_adapter"
The i2c_put_adapter() function tests whether its argument is NULL and then returns 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: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/fbdev/omap2/displays-new/connector-dvi.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/video/fbdev/omap2/displays-new/connector-dvi.c b/drivers/video/fbdev/omap2/displays-new/connector-dvi.c
index 2dfb6e5ff0cc..3d38e478bc64 100644
--- a/drivers/video/fbdev/omap2/displays-new/connector-dvi.c
+++ b/drivers/video/fbdev/omap2/displays-new/connector-dvi.c
@@ -262,8 +262,7 @@ static int dvic_probe_pdata(struct platform_device *pdev)
262 262
263 in = omap_dss_find_output(pdata->source); 263 in = omap_dss_find_output(pdata->source);
264 if (in == NULL) { 264 if (in == NULL) {
265 if (ddata->i2c_adapter) 265 i2c_put_adapter(ddata->i2c_adapter);
266 i2c_put_adapter(ddata->i2c_adapter);
267 266
268 dev_err(&pdev->dev, "Failed to find video source\n"); 267 dev_err(&pdev->dev, "Failed to find video source\n");
269 return -EPROBE_DEFER; 268 return -EPROBE_DEFER;
@@ -352,8 +351,7 @@ static int dvic_probe(struct platform_device *pdev)
352err_reg: 351err_reg:
353 omap_dss_put_device(ddata->in); 352 omap_dss_put_device(ddata->in);
354 353
355 if (ddata->i2c_adapter) 354 i2c_put_adapter(ddata->i2c_adapter);
356 i2c_put_adapter(ddata->i2c_adapter);
357 355
358 return r; 356 return r;
359} 357}
@@ -371,8 +369,7 @@ static int __exit dvic_remove(struct platform_device *pdev)
371 369
372 omap_dss_put_device(in); 370 omap_dss_put_device(in);
373 371
374 if (ddata->i2c_adapter) 372 i2c_put_adapter(ddata->i2c_adapter);
375 i2c_put_adapter(ddata->i2c_adapter);
376 373
377 return 0; 374 return 0;
378} 375}