Patchwork [6/7] pseries: Remove PCI device from PCI host bridge code

login
register
mail settings
Submitter David Gibson
Date Feb. 28, 2012, 3:18 a.m.
Message ID <1330399093-20384-7-git-send-email-david@gibson.dropbear.id.au>
Download mbox | patch
Permalink /patch/143319/
State New
Headers show

Comments

David Gibson - Feb. 28, 2012, 3:18 a.m.
From: Alexey Kardashevskiy <aik@ozlabs.ru>

The sPAPR PCI code defines a PCI device "spapr-pci-host-bridge-pci" which
is never used.  This came over from the earlier bridge driver we used as
a template.  Some other bridges appear on their own PCI bus as a device,
but that is not true of pSeries bridges, which are pure host to PCI with
no visible presence on the PCI side.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/spapr_pci.c |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)

Patch

diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
index dafcd0e..b0254ee 100644
--- a/hw/spapr_pci.c
+++ b/hw/spapr_pci.c
@@ -183,25 +183,6 @@  static int spapr_phb_init(SysBusDevice *s)
     return 0;
 }
 
-static int spapr_main_pci_host_init(PCIDevice *d)
-{
-    return 0;
-}
-
-static void spapr_main_pci_host_class_init(ObjectClass *klass, void *data)
-{
-    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
-
-    k->init = spapr_main_pci_host_init;
-}
-
-static TypeInfo spapr_main_pci_host_info = {
-    .name          = "spapr-pci-host-bridge-pci",
-    .parent        = TYPE_PCI_DEVICE,
-    .instance_size = sizeof(PCIDevice),
-    .class_init    = spapr_main_pci_host_class_init,
-};
-
 static void spapr_phb_class_init(ObjectClass *klass, void *data)
 {
     SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(klass);
@@ -219,7 +200,6 @@  static TypeInfo spapr_phb_info = {
 static void spapr_register_types(void)
 {
     type_register_static(&spapr_phb_info);
-    type_register_static(&spapr_main_pci_host_info);
 }
 
 type_init(spapr_register_types)