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: 6826671 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 18497C05AC for ; Mon, 20 Jul 2015 12:09:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C42C2060A for ; Mon, 20 Jul 2015 12:09:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 363E220629 for ; Mon, 20 Jul 2015 12:09:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754794AbbGTMGG (ORCPT ); Mon, 20 Jul 2015 08:06:06 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:43502 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752851AbbGTMFz (ORCPT ); Mon, 20 Jul 2015 08:05:55 -0400 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 CC: , , , Russell King , , , , Thomas Gleixner , , Benjamin Herrenschmidt , Rusty Russell , , , Tony Luck , , "David S. Miller" , Guan Xuetao , , , , Liviu Dudau , Arnd Bergmann , Geert Uytterhoeven , Yijing Wang 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 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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) {