From patchwork Sat May 25 13:48:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 2613411 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A85123FD4E for ; Sat, 25 May 2013 13:52:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756679Ab3EYNvs (ORCPT ); Sat, 25 May 2013 09:51:48 -0400 Received: from mail-pb0-f51.google.com ([209.85.160.51]:64549 "EHLO mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756674Ab3EYNvo (ORCPT ); Sat, 25 May 2013 09:51:44 -0400 Received: by mail-pb0-f51.google.com with SMTP id jt11so5238416pbb.38 for ; Sat, 25 May 2013 06:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=+03Ti7E3aSbL//h1nIOoUx1m+VBBJut5522hQQWRBP4=; b=ElJvgMpjKxBtYLo95tKe9pMWSpFSAQJYb6nd8Duvr9F8H7OAXkQup6CJdD3N1hdUTM f6yMQy/LFuQYBWsOCX/CILd0J6zCKOVSCcWN0uEnU+9mAxf92DYAiCAsP+XITctMMhAj bOqqkbh6ER0L4V+cSLf16jzDS6OLtz0/Vr2wXcnL4HZvXex6l7TX6ojP53wfS6/mBltW XiU3YJv9AtwXJWo67EzR4tScXxQG5PPMXO8LZECgodrHm7d9BRO4+dVcJvieRwno/DTj rBnrTmCNiJUVls9D8lb5RHusV558W+FIGapUoThuANXjt6pu2KuDjhTSqN0vZrOOrZLh Mq+g== X-Received: by 10.68.137.74 with SMTP id qg10mr21960755pbb.172.1369489904111; Sat, 25 May 2013 06:51:44 -0700 (PDT) Received: from localhost.localdomain ([114.250.94.230]) by mx.google.com with ESMTPSA id b7sm20545858pba.39.2013.05.25.06.51.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 25 May 2013 06:51:43 -0700 (PDT) From: Jiang Liu To: Bjorn Helgaas , Yinghai Lu Cc: Jiang Liu , "Rafael J . Wysocki" , Greg Kroah-Hartman , Gu Zheng , Toshi Kani , Myron Stowe , Yijing Wang , Jiang Liu , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Tony Luck , Fenghua Yu , linux-ia64@vger.kernel.org Subject: [PATCH v3, part1 05/10] PCI, IA64: minor code clean up Date: Sat, 25 May 2013 21:48:33 +0800 Message-Id: <1369489718-25869-6-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1369489718-25869-1-git-send-email-jiang.liu@huawei.com> References: <1369489718-25869-1-git-send-email-jiang.liu@huawei.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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 Cc: Tony Luck Cc: Fenghua Yu 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); } /*