From: Stephen Rothwell Date: Fri, 21 Dec 2007 04:49:11 +0000 (+1100) Subject: [POWERPC] The pci_dn pcidev is only used by EEH X-Git-Tag: v2.6.25-rc1~1131^2~127 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b6ed42a794e1ca51fb46ff2bdc562315c46dd9a8;p=linux-2.6-omap-h63xx.git [POWERPC] The pci_dn pcidev is only used by EEH Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c index 30e3d992dc0..931941036b9 100644 --- a/arch/powerpc/platforms/iseries/pci.c +++ b/arch/powerpc/platforms/iseries/pci.c @@ -438,7 +438,6 @@ void __init iSeries_pcibios_fixup_resources(struct pci_dev *pdev) } pdev->sysdata = node; - PCI_DN(node)->pcidev = pdev; allocate_device_bars(pdev); iseries_device_information(pdev, bus, *sub_bus); iommu_devnode_init_iSeries(pdev, node); diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h index 07cdb5b786f..29324047779 100644 --- a/include/asm-powerpc/pci-bridge.h +++ b/include/asm-powerpc/pci-bridge.h @@ -170,12 +170,12 @@ struct pci_dn { struct pci_controller *phb; /* for pci devices */ struct iommu_table *iommu_table; /* for phb's or bridges */ - struct pci_dev *pcidev; /* back-pointer to the pci device */ struct device_node *node; /* back-pointer to the device_node */ int pci_ext_config_space; /* for pci devices */ #ifdef CONFIG_EEH + struct pci_dev *pcidev; /* back-pointer to the pci device */ int class_code; /* pci device class */ int eeh_mode; /* See eeh.h for possible EEH_MODEs */ int eeh_config_addr;