From patchwork Mon Oct 27 07:48:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yijing Wang X-Patchwork-Id: 5157911 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DEB689F318 for ; Mon, 27 Oct 2014 07:13:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A0D820340 for ; Mon, 27 Oct 2014 07:13:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3AB6120320 for ; Mon, 27 Oct 2014 07:13:47 +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 1XieSv-0003BG-BY; Mon, 27 Oct 2014 07:11:45 +0000 Received: from szxga01-in.huawei.com ([119.145.14.64]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XieQb-0008Ol-TO for linux-arm-kernel@lists.infradead.org; Mon, 27 Oct 2014 07:09:23 +0000 Received: from 172.24.2.119 (EHLO szxeml409-hub.china.huawei.com) ([172.24.2.119]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CDM12569; Mon, 27 Oct 2014 15:07:37 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml409-hub.china.huawei.com (10.82.67.136) with Microsoft SMTP Server id 14.3.158.1; Mon, 27 Oct 2014 15:07:25 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [PATCH 10/10] PCI/MSI: Remove useless bus->msi assignment Date: Mon, 27 Oct 2014 15:48:47 +0800 Message-ID: <1414396127-30023-11-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1414396127-30023-1-git-send-email-wangyijing@huawei.com> References: <1414396127-30023-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-20141027_000922_503318_4B96B42B X-CRM114-Status: GOOD ( 10.27 ) X-Spam-Score: -1.3 (-) Cc: Thomas Petazzoni , Russell King , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Xinwei Hu , Thierry Reding , Yijing Wang , Thomas Gleixner , Wuyun , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 Thierry introduced MSI chip(now renamed to MSI controller) framework to associate MSI chip and PCI bus in arm. Other platforms still use its own arch MSI functions to support MSI capability. Thierry introduced the bus->msi assignment to make child bus can inherit bus->msi from the parent. But in fact, drivers which used MSI chip always associate MSI chip and PCI bus by add .add_bus() in arm PCI host bridge drivers. Now we have saved MSI chip in pci_sys_data. We can remove this bus->msi assignment safely. Signed-off-by: Yijing Wang CC: Thierry Reding CC: Thomas Petazzoni --- drivers/pci/msi.c | 5 ----- drivers/pci/probe.c | 1 - 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index f085f7f..27b6a54 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -37,11 +37,6 @@ struct msi_controller * __weak pcibios_msi_controller(struct pci_bus *bus) struct msi_controller *pci_msi_controller(struct pci_bus *bus) { - struct msi_controller *ctrl = bus->msi; - - if (ctrl) - return ctrl; - return pcibios_msi_controller(bus); } diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 5ed9930..4b18bf2 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -682,7 +682,6 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, child->parent = parent; child->ops = parent->ops; - child->msi = parent->msi; child->sysdata = parent->sysdata; child->bus_flags = parent->bus_flags;