From patchwork Mon May 13 16:08:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 243432 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C5B192C00B2 for ; Tue, 14 May 2013 02:10:18 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755244Ab3EMQJa (ORCPT ); Mon, 13 May 2013 12:09:30 -0400 Received: from mail-da0-f44.google.com ([209.85.210.44]:45865 "EHLO mail-da0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755219Ab3EMQJZ (ORCPT ); Mon, 13 May 2013 12:09:25 -0400 Received: by mail-da0-f44.google.com with SMTP id z8so1158366daj.3 for ; Mon, 13 May 2013 09:09:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=+03Ti7E3aSbL//h1nIOoUx1m+VBBJut5522hQQWRBP4=; b=QMSw017355Fe//dRI9LenpO8LOKF5Qso/NYobphkVJ9qbo5bwbGkCmeSAs7bo+7wEH UoTReHB+tzDCapDw6tuJGEi/0VDeiSbyTwfDyAH5sLmDXtcf0OZt6nOayxPeuX0Tb0l+ 6hOpUXCIj/EgSEfnV/SfRxcYrrMkHaEdJhEvCaD0zCIgGO6p4Fdiq45y49vH81aZfQLt 4ABiIsV7YEb7PyJCSHGm63AFuO7KwUn6raHXh2nnebcJF1ZJlXO27TRpXrTbyXxLc64Y fiB3yzmUZRF5j275ptOlL3tSCq+mxKy5dTK8VUDFFuoR5TpsI2yOy3bvSU4FVrFfUqrs ArGA== X-Received: by 10.67.1.39 with SMTP id bd7mr29719019pad.194.1368461364562; Mon, 13 May 2013 09:09:24 -0700 (PDT) Received: from localhost.localdomain ([120.196.98.100]) by mx.google.com with ESMTPSA id nt2sm14580193pbc.17.2013.05.13.09.09.20 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 May 2013 09:09:23 -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 v2, part 1 7/9] PCI, IA64: minor code clean up Date: Tue, 14 May 2013 00:08:31 +0800 Message-Id: <1368461313-4371-8-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1368461313-4371-1-git-send-email-jiang.liu@huawei.com> References: <1368461313-4371-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); } /*