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: 7201631 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 635119F380 for ; Thu, 17 Sep 2015 00:35:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 84C4B2073D for ; Thu, 17 Sep 2015 00:35:35 +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 B4CE520611 for ; Thu, 17 Sep 2015 00:35:34 +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 1ZcN8a-0002VY-07; Thu, 17 Sep 2015 00:33:20 +0000 Received: from mail-pa0-x22d.google.com ([2607:f8b0:400e:c03::22d]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZcN8X-0002TE-Jy for linux-arm-kernel@lists.infradead.org; Thu, 17 Sep 2015 00:33:18 +0000 Received: by pacfv12 with SMTP id fv12so3160335pac.2 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=SmpMgci+naPvlVA/uOhLg33Va1Xr6u3f+KP/jRg4Wjp/8ig7sJ3QaLDf1AP6NmO6TR tI35wgvj452PuZ8KxOmhExW9tOh1y3DsZswGb904KK6wmlnN5JjV1k8ZT2cNOA1iKmEL SwP3hlKC6cQLCOsoOjka3bCaM2p+Kf/VLVoWwBoQBNM9tLT5t5KC9gx3T4+gbEsqEHqW YnpkXtTnjeEQWntRnj9cLMoodkbUIX6YTefsiMvY5hOmx1NvddFHE9GurZISKcGUOuKE 1e+OWTc5k/hObSgoQNSMBVLUmveO8B9fpMP1WFbBZhe4paZcliiSZxvAJUlntOvt63PO wYBQ== X-Gm-Message-State: ALoCoQkW08HcE3aVTkhb+oM320dn04xBzIdnkRX1EK8ZS5HICrUm3dIG5XCEuZvhhvPePwviVd3g 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150916_173317_681576_04DA7EDD X-CRM114-Status: GOOD ( 11.33 ) X-Spam-Score: -2.7 (--) 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: Marc Zyngier , linux-pci@vger.kernel.org, Duc Dang , patches@apm.com, linux-kernel@vger.kernel.org, Tanmay Inamdar , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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);