Commit 45659274 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Remove unused struct 'acpi_handle_node' (Dr. David Alan Gilbert)

- Use array notation for portdrv .id_table consistently (Masahiro Yamada)

- Switch to new Intel CPU model defines (Tony Luck)

- Add missing MODULE_DESCRIPTION() macros (Jeff Johnson)

* pci/misc:
  PCI: controller: Add missing MODULE_DESCRIPTION() macros
  PCI: Add missing MODULE_DESCRIPTION() macros
  PCI/PM: Switch to new Intel CPU model defines
  PCI: Use array for .id_table consistently
  ACPI: PCI: Remove unused struct 'acpi_handle_node'
parents 19a3eec1 142a41da

Documentation/PCI/pciebus-howto.rst

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ driver data structure. 


  static struct pcie_port_service_driver root_aerdrv = {

    .name		= (char *)device_name,

    .id_table	= &service_id[0],

    .id_table	= service_id,



    .probe		= aerdrv_load,

    .remove		= aerdrv_unload,

Documentation/translations/zh_CN/PCI/pciebus-howto.rst

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ pcie_port_service_unregister取代了Linux驱动模型的pci_unregister_driver 


  static struct pcie_port_service_driver root_aerdrv = {

    .name		= (char *)device_name,

    .id_table	= &service_id[0],

    .id_table	= service_id,



    .probe		= aerdrv_load,

    .remove		= aerdrv_unload,

drivers/acpi/pci_root.c

+0 −5
Original line number Diff line number Diff line
@@ -293,11 +293,6 @@ struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle) 
}

EXPORT_SYMBOL_GPL(acpi_pci_find_root);



struct acpi_handle_node {

	struct list_head node;

	acpi_handle handle;

};



/**

 * acpi_get_pci_dev - convert ACPI CA handle to struct pci_dev

 * @handle: the handle in question

drivers/pci/controller/dwc/pci-exynos.c

+1 −0
Original line number Diff line number Diff line
@@ -391,5 +391,6 @@ static struct platform_driver exynos_pcie_driver = { 
	},

};

module_platform_driver(exynos_pcie_driver);

MODULE_DESCRIPTION("Samsung Exynos PCIe host controller driver");

MODULE_LICENSE("GPL v2");

MODULE_DEVICE_TABLE(of, exynos_pcie_of_match);

drivers/pci/controller/pci-host-common.c

+1 −0
Original line number Diff line number Diff line
@@ -92,4 +92,5 @@ void pci_host_common_remove(struct platform_device *pdev) 
}

EXPORT_SYMBOL_GPL(pci_host_common_remove);



MODULE_DESCRIPTION("Generic PCI host common driver");

MODULE_LICENSE("GPL v2");