From patchwork Thu Sep 17 00:31:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duc Dang X-Patchwork-Id: 7201611 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 5A6EABEEC1 for ; Thu, 17 Sep 2015 00:33:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A72A2082A for ; Thu, 17 Sep 2015 00:33:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFEAB20611 for ; Thu, 17 Sep 2015 00:32:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752750AbbIQAc5 (ORCPT ); Wed, 16 Sep 2015 20:32:57 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:33637 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752721AbbIQAc4 (ORCPT ); Wed, 16 Sep 2015 20:32:56 -0400 Received: by pacex6 with SMTP id ex6so3195396pac.0 for ; Wed, 16 Sep 2015 17:32:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id; bh=DvMcHIPpuxEK4qssSmU234yDBnD5u5cPtIr4P1dlT/U=; b=AQBBf0TLBZLKDiCBJBD7rleIIDdUzpK1j4C1O01v09MZhWOOaKHJu5KcoFMsFcfrqT oNJhn8Xs9q1le0yYBAPIw+GqbhswgMiN9EGuzaq9Ym6WMVc85OnuMExMPFJMN4ttaYpi gyu/TvY3q3Z/ElTHdjaxVevjxyjuad51ODDII= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=DvMcHIPpuxEK4qssSmU234yDBnD5u5cPtIr4P1dlT/U=; b=L1yaaXov0f76G/1OWgj1zNzjbG4t3YT16Bm3I0+9CpVpuaanS8kRdWPuSbcf22zVlu HRILW3Cb5rKMYNdxZM5MmZaRzTP/LGn1znJ+YyBr960VYMLmvlo1IRVbZxwEIFoGU21Q vM8ffmn+zVcKtoYFGRFSkcR8X7uGokqCE7YcfAQPqLb6J5uXHoB5wbY6tFnF62MwmShF 3T5ZfiHlM9X2RwEDw/y61B8f5N5UU+KtT75zl6VvvjR/b24BAifVSJjw5wybG9+H3YUI rcUzmUNhn/24T/rOD+vNhvbohRwMgy0AnDDb1q+NinexlMnHSiw8QSQvXRjGQE2KdOiK 3T0Q== X-Gm-Message-State: ALoCoQnd+zzc5jn6Oic/vM9Ows+GCdLmiUqGTxnpxCzhBnkA6/y2BC1asQaJzX2wcIwKvBhfZkMq X-Received: by 10.66.190.6 with SMTP id gm6mr65411468pac.27.1442449976506; Wed, 16 Sep 2015 17:32:56 -0700 (PDT) Received: from dhdang-Precision-WorkStation-T3400.amcc.com (70-35-53-82.static.wiline.com. [70.35.53.82]) by smtp.gmail.com with ESMTPSA id uy4sm394701pbc.69.2015.09.16.17.32.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Sep 2015 17:32:55 -0700 (PDT) From: Duc Dang To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Tanmay Inamdar , patches@apm.com, Marc Zyngier , Duc Dang Subject: [PATCH 1/1] PCI/MSI: X-Gene: Remove msi_controller assignment in X-Gene PCIe driver Date: Wed, 16 Sep 2015 17:31:40 -0700 Message-Id: <1442449900-30842-1-git-send-email-dhdang@apm.com> X-Mailer: git-send-email 1.9.1 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_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 With commit 8d63bc7beaee ("PCI/MSI: pci-xgene-msi: Get rid of struct msi_controller"), it is no longer required to assign msi_controller for X-Gene PCIe host bridge to support MSI. This patch removes this unnecessary code and also helps avoid a warning message ("failed to enable MSI") during boot. Signed-off-by: Duc Dang Cc: Tanmay Inamdar Acked-by: Marc Zyngier --- drivers/pci/host/pci-xgene.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c index 0236ab9..ae00ce2 100644 --- a/drivers/pci/host/pci-xgene.c +++ b/drivers/pci/host/pci-xgene.c @@ -509,24 +509,6 @@ static int xgene_pcie_setup(struct xgene_pcie_port *port, return 0; } -static int xgene_pcie_msi_enable(struct pci_bus *bus) -{ - struct device_node *msi_node; - - msi_node = of_parse_phandle(bus->dev.of_node, - "msi-parent", 0); - if (!msi_node) - return -ENODEV; - - bus->msi = of_pci_find_msi_chip_by_node(msi_node); - if (!bus->msi) - return -ENODEV; - - of_node_put(msi_node); - bus->msi->dev = &bus->dev; - return 0; -} - static int xgene_pcie_probe_bridge(struct platform_device *pdev) { struct device_node *dn = pdev->dev.of_node; @@ -567,10 +549,6 @@ static int xgene_pcie_probe_bridge(struct platform_device *pdev) if (!bus) return -ENOMEM; - if (IS_ENABLED(CONFIG_PCI_MSI)) - if (xgene_pcie_msi_enable(bus)) - dev_info(port->dev, "failed to enable MSI\n"); - pci_scan_child_bus(bus); pci_assign_unassigned_bus_resources(bus); pci_bus_add_devices(bus);