提交 6049a7a2 编写于 作者: M Markus Elfring 提交者: Tomi Valkeinen

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: NMarkus Elfring <elfring@users.sourceforge.net>
Signed-off-by: NTomi Valkeinen <tomi.valkeinen@ti.com>
上级 2daff4d4
...@@ -5989,7 +5989,7 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -5989,7 +5989,7 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if(!ivideo->sisvga_enabled) { if(!ivideo->sisvga_enabled) {
if(pci_enable_device(pdev)) { if(pci_enable_device(pdev)) {
if(ivideo->nbridge) pci_dev_put(ivideo->nbridge); pci_dev_put(ivideo->nbridge);
framebuffer_release(sis_fb_info); framebuffer_release(sis_fb_info);
return -EIO; return -EIO;
} }
...@@ -6202,10 +6202,8 @@ error_0: iounmap(ivideo->video_vbase); ...@@ -6202,10 +6202,8 @@ error_0: iounmap(ivideo->video_vbase);
error_1: release_mem_region(ivideo->video_base, ivideo->video_size); error_1: release_mem_region(ivideo->video_base, ivideo->video_size);
error_2: release_mem_region(ivideo->mmio_base, ivideo->mmio_size); error_2: release_mem_region(ivideo->mmio_base, ivideo->mmio_size);
error_3: vfree(ivideo->bios_abase); error_3: vfree(ivideo->bios_abase);
if(ivideo->lpcdev) pci_dev_put(ivideo->lpcdev);
pci_dev_put(ivideo->lpcdev); pci_dev_put(ivideo->nbridge);
if(ivideo->nbridge)
pci_dev_put(ivideo->nbridge);
if(!ivideo->sisvga_enabled) if(!ivideo->sisvga_enabled)
pci_disable_device(pdev); pci_disable_device(pdev);
framebuffer_release(sis_fb_info); framebuffer_release(sis_fb_info);
...@@ -6505,11 +6503,9 @@ static void sisfb_remove(struct pci_dev *pdev) ...@@ -6505,11 +6503,9 @@ static void sisfb_remove(struct pci_dev *pdev)
vfree(ivideo->bios_abase); 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 #ifdef CONFIG_MTRR
/* Release MTRR region */ /* Release MTRR region */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册