tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

video: fbdev-SIS: Deletion of unnecessary checks before the function call "pci_dev_put"

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>

authored by

Markus Elfring and committed by
Tomi Valkeinen 6049a7a2 2daff4d4

+5 -9
+5 -9
drivers/video/fbdev/sis/sis_main.c
··· 5989 5989 5990 5990 if(!ivideo->sisvga_enabled) { 5991 5991 if(pci_enable_device(pdev)) { 5992 - if(ivideo->nbridge) pci_dev_put(ivideo->nbridge); 5992 + pci_dev_put(ivideo->nbridge); 5993 5993 framebuffer_release(sis_fb_info); 5994 5994 return -EIO; 5995 5995 } ··· 6202 6202 error_1: release_mem_region(ivideo->video_base, ivideo->video_size); 6203 6203 error_2: release_mem_region(ivideo->mmio_base, ivideo->mmio_size); 6204 6204 error_3: vfree(ivideo->bios_abase); 6205 - if(ivideo->lpcdev) 6206 - pci_dev_put(ivideo->lpcdev); 6207 - if(ivideo->nbridge) 6208 - pci_dev_put(ivideo->nbridge); 6205 + pci_dev_put(ivideo->lpcdev); 6206 + pci_dev_put(ivideo->nbridge); 6209 6207 if(!ivideo->sisvga_enabled) 6210 6208 pci_disable_device(pdev); 6211 6209 framebuffer_release(sis_fb_info); ··· 6503 6505 6504 6506 vfree(ivideo->bios_abase); 6505 6507 6506 - if(ivideo->lpcdev) 6507 - pci_dev_put(ivideo->lpcdev); 6508 + pci_dev_put(ivideo->lpcdev); 6508 6509 6509 - if(ivideo->nbridge) 6510 - pci_dev_put(ivideo->nbridge); 6510 + pci_dev_put(ivideo->nbridge); 6511 6511 6512 6512 #ifdef CONFIG_MTRR 6513 6513 /* Release MTRR region */