From patchwork Mon Jul 20 12:01:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 6826691 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2F7279F380 for ; Mon, 20 Jul 2015 12:09:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 436F420656 for ; Mon, 20 Jul 2015 12:09:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 02A9020627 for ; Mon, 20 Jul 2015 12:09:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZH9qy-0006uN-TQ; Mon, 20 Jul 2015 12:07:28 +0000 Received: from szxga02-in.huawei.com ([119.145.14.65]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZH9qX-0006cu-OV for linux-arm-kernel@lists.infradead.org; Mon, 20 Jul 2015 12:07:03 +0000 Received: from 172.24.1.47 (EHLO szxeml432-hub.china.huawei.com) ([172.24.1.47]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id COZ21657; Mon, 20 Jul 2015 20:05:33 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml432-hub.china.huawei.com (10.82.67.209) with Microsoft SMTP Server id 14.3.158.1; Mon, 20 Jul 2015 20:05:21 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH part3 v12 06/10] PCI: Make pci_host_bridge hold sysdata in drvdata Date: Mon, 20 Jul 2015 20:01:14 +0800 Message-ID: <1437393678-4077-7-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1437393678-4077-1-git-send-email-wangyijing@huawei.com> References: <1437393678-4077-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150720_050702_146507_088D0E0A X-CRM114-Status: GOOD ( 14.69 ) X-Spam-Score: -5.4 (-----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mips@linux-mips.org, linux-ia64@vger.kernel.org, linux-pci@vger.kernel.org, Yijing Wang , Guan Xuetao , linux-s390@vger.kernel.org, linux-am33-list@redhat.com, Russell King , x86@kernel.org, Geert Uytterhoeven , Benjamin Herrenschmidt , linux-xtensa@linux-xtensa.org, Arnd Bergmann , Rusty Russell , linux-m68k@lists.linux-m68k.org, Thomas Gleixner , linux-arm-kernel@lists.infradead.org, dja@axtens.net, Tony Luck , linux-kernel@vger.kernel.org, linux-alpha@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, "David S. Miller" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now platform specific sysdata is saved in pci_bus, and pcibios_root_bridge_prepare() need to know the sysdata. Later, we would move pcibios_root_bridge_prepare() prior to root bus creation, so we need to make pci_host_bridge hold sysdata. Signed-off-by: Yijing Wang --- arch/ia64/pci/pci.c | 2 +- arch/x86/pci/acpi.c | 2 +- drivers/pci/probe.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 67ffe1f..8f79852 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -485,7 +485,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) * that case. */ if (!bridge->dev.parent) { - struct pci_controller *controller = bridge->bus->sysdata; + struct pci_controller *controller = dev_get_drvdata(&bridge->dev); ACPI_COMPANION_SET(&bridge->dev, controller->companion); } return 0; diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 629fc3b..38ce348 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c @@ -502,7 +502,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) * that case. */ if (!bridge->dev.parent) { - struct pci_sysdata *sd = bridge->bus->sysdata; + struct pci_sysdata *sd = dev_get_drvdata(&bridge->dev); ACPI_COMPANION_SET(&bridge->dev, sd->companion); } return 0; diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 0eba126..0ae8bf2 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1967,6 +1967,7 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int domain, bridge->domain = domain; bridge->dev.parent = parent; bridge->dev.release = pci_release_host_bridge_dev; + dev_set_drvdata(&bridge->dev, sysdata); dev_set_name(&bridge->dev, "pci%04x:%02x", pci_domain_nr(b), bus); error = pcibios_root_bridge_prepare(bridge); if (error) {