diff options
| author | Markus Elfring <elfring@users.sourceforge.net> | 2014-11-23 14:55:25 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-12-04 17:16:01 +0300 |
| commit | 6049a7a2535bf0b5021b527e60dee9eda022bc90 (patch) | |
| tree | 5e0eb64172a85c0fe3b16fa248335c4eef24894d /drivers/video/fbdev/sis | |
| parent | 2daff4d48d7e9acde58a68de3cd11f8215780499 (diff) | |
| download | linux-6049a7a2535bf0b5021b527e60dee9eda022bc90.tar.xz | |
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>
Diffstat (limited to 'drivers/video/fbdev/sis')
| -rw-r--r-- | drivers/video/fbdev/sis/sis_main.c | 14 |
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) 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 */ |