lkml.org 
[lkml]   [2013]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2, part 1 7/9] PCI, IA64: minor code clean up
    Date
    pci_scan_root_bus() already set bus->sysdata, so no need to explicitly
    set it again in function sn_pci_controller_fixup();

    Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    Cc: linux-ia64@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org
    ---
    arch/ia64/sn/kernel/io_init.c | 11 +----------
    1 file changed, 1 insertion(+), 10 deletions(-)

    diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
    index 238e2c5..e2c7733 100644
    --- a/arch/ia64/sn/kernel/io_init.c
    +++ b/arch/ia64/sn/kernel/io_init.c
    @@ -326,16 +326,7 @@ sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
    bus = pci_scan_root_bus(NULL, busnum, &pci_root_ops, controller,
    &resources);
    if (bus == NULL)
    - goto error_return; /* error, or bus already scanned */
    -
    - bus->sysdata = controller;
    -
    - return;
    -
    -error_return:
    -
    - kfree(controller);
    - return;
    + kfree(controller);
    }

    /*
    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-05-13 18:41    [W:5.133 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site