Merge tag 'powerpc-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[linux-drm-fsl-dcu.git] / arch / powerpc / sysdev / fsl_pci.c

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 271b67e7670c71fb6ee14bfa260635cf1d944f62..4b74c276e427e49ccf7cc748f496a7d6ba650a6e 100644 (file)
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -68,13 +68,10 @@ static int fsl_pcie_check_link(struct pci_controller *hose)
        u32 val = 0;
 
        if (hose->indirect_type & PPC_INDIRECT_TYPE_FSL_CFG_REG_LINK) {
-               if (hose->ops->read == fsl_indirect_read_config) {
-                       struct pci_bus bus;
-                       bus.number = hose->first_busno;
-                       bus.sysdata = hose;
-                       bus.ops = hose->ops;
-                       indirect_read_config(&bus, 0, PCIE_LTSSM, 4, &val);
-               } else
+               if (hose->ops->read == fsl_indirect_read_config)
+                       __indirect_read_config(hose, hose->first_busno, 0,
+                                              PCIE_LTSSM, 4, &val);
+               else
                        early_read_config_dword(hose, 0, 0, PCIE_LTSSM, &val);
                if (val < PCIE_LTSSM_L0)
                        return 1;