diff options
-rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 5 | ||||
-rw-r--r-- | drivers/pci/quirks.c | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 5648137..d213c83 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -41,7 +41,7 @@ static int fsl_pcie_bus_fixup, is_mpc83xx_pci; -static void quirk_fsl_pcie_header(struct pci_dev *dev) +static void quirk_fsl_pcie_early(struct pci_dev *dev) { u8 hdr_type; @@ -626,7 +626,8 @@ no_bridge: } #endif /* CONFIG_FSL_SOC_BOOKE || CONFIG_PPC_86xx */ -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, + quirk_fsl_pcie_early); #if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x) struct mpc83xx_pcie_priv { diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 5088639..0369fb6 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2794,16 +2794,6 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x342e, vtd_mask_spec_errors); DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x3c28, vtd_mask_spec_errors); #endif -#ifdef CONFIG_FSL_PCI -static void quirk_freescale_class(struct pci_dev *dev) -{ - dev_info(&dev->dev, "Setting PCI class for FSL PCI host bridge\n"); - dev->class = (PCI_CLASS_BRIDGE_PCI << 8) | (dev->class & 0xff); -} -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_FREESCALE, PCI_ANY_ID, - quirk_freescale_class); -#endif - static void fixup_ti816x_class(struct pci_dev *dev) { /* TI 816x devices do not have class code set when in PCIe boot mode */ |