• Bjorn Helgaas's avatar
    Merge branch 'pci/driver-cleanup' · 87c71931
    Bjorn Helgaas authored
    - Use of_device_get_match_data(), not of_match_device(), when we only need
      the device data in altera, artpec6, cadence, designware-plat, dra7xx,
      keystone, kirin (Fan Fei)
    
    - Drop pointless of_device_get_match_data() cast in j721e (Bjorn Helgaas)
    
    - Drop redundant struct device * from j721e since struct cdns_pcie already
      has one (Bjorn Helgaas)
    
    - Rename driver structs to *_pcie in intel-gw, iproc, ls-gen4,
      mediatek-gen3, microchip, mt7621, rcar-gen2, tegra194, uniphier, xgene,
      xilinx, xilinx-cpm for consistency across drivers (Fan Fei)
    
    - Fix invalid address space conversions in hisi, spear13xx (Bjorn Helgaas)
    
    * pci/driver-cleanup:
      PCI: spear13xx: Avoid invalid address space conversions
      PCI: hisi: Avoid invalid address space conversions
      PCI: xilinx-cpm: Rename xilinx_cpm_pcie_port to xilinx_cpm_pcie
      PCI: xilinx: Rename xilinx_pcie_port to xilinx_pcie
      PCI: xgene: Rename xgene_pcie_port to xgene_pcie
      PCI: uniphier: Rename uniphier_pcie_priv to uniphier_pcie
      PCI: tegra194: Rename tegra_pcie_dw to tegra194_pcie
      PCI: rcar-gen2: Rename rcar_pci_priv to rcar_pci
      PCI: mt7621: Rename mt7621_pci_ to mt7621_pcie_
      PCI: microchip: Rename mc_port to mc_pcie
      PCI: mediatek-gen3: Rename mtk_pcie_port to mtk_gen3_pcie
      PCI: ls-gen4: Rename ls_pcie_g4 to ls_g4_pcie
      PCI: iproc: Rename iproc_pcie_pltfm_ to iproc_pltfm_pcie_
      PCI: iproc: Rename iproc_pcie_bcma_ to iproc_bcma_pcie_
      PCI: intel-gw: Rename intel_pcie_port to intel_pcie
      PCI: j721e: Drop redundant struct device *
      PCI: j721e: Drop pointless of_device_get_match_data() cast
      PCI: kirin: Prefer of_device_get_match_data()
      PCI: keystone: Prefer of_device_get_match_data()
      PCI: dra7xx: Prefer of_device_get_match_data()
      PCI: designware-plat: Prefer of_device_get_match_data()
      PCI: cadence: Prefer of_device_get_match_data()
      PCI: artpec6: Prefer of_device_get_match_data()
      PCI: altera: Prefer of_device_get_match_data()
    
    # Conflicts:
    #	drivers/pci/controller/pcie-mt7621.c
    87c71931
pcie-mediatek-gen3.c 26.6 KB