video: fbdev-SIS: Deletion of unnecessary checks before the function call "pci_dev_put"
authorMarkus Elfring <elfring@users.sourceforge.net>
Sun, 23 Nov 2014 11:55:25 +0000 (12:55 +0100)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Thu, 4 Dec 2014 14:16:01 +0000 (16:16 +0200)
The pci_dev_put() 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>
drivers/video/fbdev/sis/sis_main.c

index e5d11b1892e8be74166ef63a3d3585ef98c463cc..fcf610edf217b83a18f0216deba34fb4c416c835 100644 (file)
@@ -5989,7 +5989,7 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        if(!ivideo->sisvga_enabled) {
                if(pci_enable_device(pdev)) {
-                       if(ivideo->nbridge) pci_dev_put(ivideo->nbridge);
+                       pci_dev_put(ivideo->nbridge);
                        framebuffer_release(sis_fb_info);
                        return -EIO;
                }
@@ -6202,10 +6202,8 @@ error_0: iounmap(ivideo->video_vbase);
 error_1:       release_mem_region(ivideo->video_base, ivideo->video_size);
 error_2:       release_mem_region(ivideo->mmio_base, ivideo->mmio_size);
 error_3:       vfree(ivideo->bios_abase);
-               if(ivideo->lpcdev)
-                       pci_dev_put(ivideo->lpcdev);
-               if(ivideo->nbridge)
-                       pci_dev_put(ivideo->nbridge);
+               pci_dev_put(ivideo->lpcdev);
+               pci_dev_put(ivideo->nbridge);
                if(!ivideo->sisvga_enabled)
                        pci_disable_device(pdev);
                framebuffer_release(sis_fb_info);
@@ -6505,11 +6503,9 @@ static void sisfb_remove(struct pci_dev *pdev)
 
        vfree(ivideo->bios_abase);
 
-       if(ivideo->lpcdev)
-               pci_dev_put(ivideo->lpcdev);
+       pci_dev_put(ivideo->lpcdev);
 
-       if(ivideo->nbridge)
-               pci_dev_put(ivideo->nbridge);
+       pci_dev_put(ivideo->nbridge);
 
 #ifdef CONFIG_MTRR
        /* Release MTRR region */