aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Elfring <elfring@users.sourceforge.net>2014-11-23 06:55:25 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-12-04 09:16:01 -0500
commit6049a7a2535bf0b5021b527e60dee9eda022bc90 (patch)
tree5e0eb64172a85c0fe3b16fa248335c4eef24894d
parent2daff4d48d7e9acde58a68de3cd11f8215780499 (diff)
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>
-rw-r--r--drivers/video/fbdev/sis/sis_main.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c
index e5d11b1892e8..fcf610edf217 100644
--- a/drivers/video/fbdev/sis/sis_main.c
+++ b/drivers/video/fbdev/sis/sis_main.c
@@ -5989,7 +5989,7 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
5989 5989
5990 if(!ivideo->sisvga_enabled) { 5990 if(!ivideo->sisvga_enabled) {
5991 if(pci_enable_device(pdev)) { 5991 if(pci_enable_device(pdev)) {
5992 if(ivideo->nbridge) pci_dev_put(ivideo->nbridge); 5992 pci_dev_put(ivideo->nbridge);
5993 framebuffer_release(sis_fb_info); 5993 framebuffer_release(sis_fb_info);
5994 return -EIO; 5994 return -EIO;
5995 } 5995 }
@@ -6202,10 +6202,8 @@ error_0: iounmap(ivideo->video_vbase);
6202error_1: release_mem_region(ivideo->video_base, ivideo->video_size); 6202error_1: release_mem_region(ivideo->video_base, ivideo->video_size);
6203error_2: release_mem_region(ivideo->mmio_base, ivideo->mmio_size); 6203error_2: release_mem_region(ivideo->mmio_base, ivideo->mmio_size);
6204error_3: vfree(ivideo->bios_abase); 6204error_3: vfree(ivideo->bios_abase);
6205 if(ivideo->lpcdev) 6205 pci_dev_put(ivideo->lpcdev);
6206 pci_dev_put(ivideo->lpcdev); 6206 pci_dev_put(ivideo->nbridge);
6207 if(ivideo->nbridge)
6208 pci_dev_put(ivideo->nbridge);
6209 if(!ivideo->sisvga_enabled) 6207 if(!ivideo->sisvga_enabled)
6210 pci_disable_device(pdev); 6208 pci_disable_device(pdev);
6211 framebuffer_release(sis_fb_info); 6209 framebuffer_release(sis_fb_info);
@@ -6505,11 +6503,9 @@ static void sisfb_remove(struct pci_dev *pdev)
6505 6503
6506 vfree(ivideo->bios_abase); 6504 vfree(ivideo->bios_abase);
6507 6505
6508 if(ivideo->lpcdev) 6506 pci_dev_put(ivideo->lpcdev);
6509 pci_dev_put(ivideo->lpcdev);
6510 6507
6511 if(ivideo->nbridge) 6508 pci_dev_put(ivideo->nbridge);
6512 pci_dev_put(ivideo->nbridge);
6513 6509
6514#ifdef CONFIG_MTRR 6510#ifdef CONFIG_MTRR
6515 /* Release MTRR region */ 6511 /* Release MTRR region */