Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI/MSI: xgene: Remove msi_controller assignment

After 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.

Remove this unnecessary code. This also avoids a warning message ("failed
to enable MSI") during boot.

[bhelgaas: changelog]
Signed-off-by: Duc Dang <dhdang@apm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Cc: Tanmay Inamdar <tinamdar@apm.com>

authored by

Duc Dang and committed by
Bjorn Helgaas
00b9b91c 6ff33f39

-22
-22
drivers/pci/host/pci-xgene.c
··· 509 509 return 0; 510 510 } 511 511 512 - static int xgene_pcie_msi_enable(struct pci_bus *bus) 513 - { 514 - struct device_node *msi_node; 515 - 516 - msi_node = of_parse_phandle(bus->dev.of_node, 517 - "msi-parent", 0); 518 - if (!msi_node) 519 - return -ENODEV; 520 - 521 - bus->msi = of_pci_find_msi_chip_by_node(msi_node); 522 - if (!bus->msi) 523 - return -ENODEV; 524 - 525 - of_node_put(msi_node); 526 - bus->msi->dev = &bus->dev; 527 - return 0; 528 - } 529 - 530 512 static int xgene_pcie_probe_bridge(struct platform_device *pdev) 531 513 { 532 514 struct device_node *dn = pdev->dev.of_node; ··· 548 566 &xgene_pcie_ops, port, &res); 549 567 if (!bus) 550 568 return -ENOMEM; 551 - 552 - if (IS_ENABLED(CONFIG_PCI_MSI)) 553 - if (xgene_pcie_msi_enable(bus)) 554 - dev_info(port->dev, "failed to enable MSI\n"); 555 569 556 570 pci_scan_child_bus(bus); 557 571 pci_assign_unassigned_bus_resources(bus);