lkml.org 
[lkml]   [2014]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/1] video: fbdev-SIS: Deletion of unnecessary checks before the function call "pci_dev_put"
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Sun, 23 Nov 2014 12:55:25 +0100

    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>
    ---
    drivers/video/fbdev/sis/sis_main.c | 14 +++++---------
    1 file changed, 5 insertions(+), 9 deletions(-)

    diff --git a/drivers/video/fbdev/sis/sis_main.c b/drivers/video/fbdev/sis/sis_main.c
    index 3f12a2d..6548a3e 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 */
    --
    2.1.3


    \
     
     \ /
      Last update: 2014-11-23 13:41    [W:4.050 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site