Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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'

+19 -12
+1 -1
Documentation/PCI/pciebus-howto.rst
··· 139 139 140 140 static struct pcie_port_service_driver root_aerdrv = { 141 141 .name = (char *)device_name, 142 - .id_table = &service_id[0], 142 + .id_table = service_id, 143 143 144 144 .probe = aerdrv_load, 145 145 .remove = aerdrv_unload,
+1 -1
Documentation/translations/zh_CN/PCI/pciebus-howto.rst
··· 124 124 125 125 static struct pcie_port_service_driver root_aerdrv = { 126 126 .name = (char *)device_name, 127 - .id_table = &service_id[0], 127 + .id_table = service_id, 128 128 129 129 .probe = aerdrv_load, 130 130 .remove = aerdrv_unload,
-5
drivers/acpi/pci_root.c
··· 293 293 } 294 294 EXPORT_SYMBOL_GPL(acpi_pci_find_root); 295 295 296 - struct acpi_handle_node { 297 - struct list_head node; 298 - acpi_handle handle; 299 - }; 300 - 301 296 /** 302 297 * acpi_get_pci_dev - convert ACPI CA handle to struct pci_dev 303 298 * @handle: the handle in question
+1
drivers/pci/controller/dwc/pci-exynos.c
··· 391 391 }, 392 392 }; 393 393 module_platform_driver(exynos_pcie_driver); 394 + MODULE_DESCRIPTION("Samsung Exynos PCIe host controller driver"); 394 395 MODULE_LICENSE("GPL v2"); 395 396 MODULE_DEVICE_TABLE(of, exynos_pcie_of_match);
+1
drivers/pci/controller/pci-host-common.c
··· 92 92 } 93 93 EXPORT_SYMBOL_GPL(pci_host_common_remove); 94 94 95 + MODULE_DESCRIPTION("Generic PCI host common driver"); 95 96 MODULE_LICENSE("GPL v2");
+1
drivers/pci/controller/pci-host-generic.c
··· 86 86 }; 87 87 module_platform_driver(gen_pci_driver); 88 88 89 + MODULE_DESCRIPTION("Generic PCI host controller driver"); 89 90 MODULE_LICENSE("GPL v2");
+1
drivers/pci/controller/pcie-altera-msi.c
··· 290 290 subsys_initcall(altera_msi_init); 291 291 MODULE_DEVICE_TABLE(of, altera_msi_of_match); 292 292 module_exit(altera_msi_exit); 293 + MODULE_DESCRIPTION("Altera PCIe MSI support driver"); 293 294 MODULE_LICENSE("GPL v2");
+1
drivers/pci/controller/pcie-altera.c
··· 826 826 827 827 MODULE_DEVICE_TABLE(of, altera_pcie_of_match); 828 828 module_platform_driver(altera_pcie_driver); 829 + MODULE_DESCRIPTION("Altera PCIe host controller driver"); 829 830 MODULE_LICENSE("GPL v2");
+1
drivers/pci/controller/pcie-apple.c
··· 839 839 }; 840 840 module_platform_driver(apple_pcie_driver); 841 841 842 + MODULE_DESCRIPTION("Apple PCIe host bridge driver"); 842 843 MODULE_LICENSE("GPL v2");
+1
drivers/pci/controller/pcie-mediatek-gen3.c
··· 1091 1091 }; 1092 1092 1093 1093 module_platform_driver(mtk_pcie_driver); 1094 + MODULE_DESCRIPTION("MediaTek Gen3 PCIe host controller driver"); 1094 1095 MODULE_LICENSE("GPL v2");
+1
drivers/pci/controller/pcie-mediatek.c
··· 1252 1252 }, 1253 1253 }; 1254 1254 module_platform_driver(mtk_pcie_driver); 1255 + MODULE_DESCRIPTION("MediaTek PCIe host controller driver"); 1255 1256 MODULE_LICENSE("GPL v2");
+1
drivers/pci/controller/pcie-mt7621.c
··· 549 549 }; 550 550 builtin_platform_driver(mt7621_pcie_driver); 551 551 552 + MODULE_DESCRIPTION("MediaTek MT7621 PCIe host controller driver"); 552 553 MODULE_LICENSE("GPL v2");
+1
drivers/pci/controller/vmd.c
··· 1128 1128 module_pci_driver(vmd_drv); 1129 1129 1130 1130 MODULE_AUTHOR("Intel Corporation"); 1131 + MODULE_DESCRIPTION("Volume Management Device driver"); 1131 1132 MODULE_LICENSE("GPL v2"); 1132 1133 MODULE_VERSION("0.6");
+2 -2
drivers/pci/pci-mid.c
··· 38 38 * arch/x86/platform/intel-mid/pwr.c. 39 39 */ 40 40 static const struct x86_cpu_id lpss_cpu_ids[] = { 41 - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, NULL), 42 - X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, NULL), 41 + X86_MATCH_VFM(INTEL_ATOM_SALTWELL_MID, NULL), 42 + X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, NULL), 43 43 {} 44 44 }; 45 45
+1
drivers/pci/pci-pf-stub.c
··· 39 39 }; 40 40 module_pci_driver(pf_stub_driver); 41 41 42 + MODULE_DESCRIPTION("SR-IOV PF stub driver with no functionality"); 42 43 MODULE_LICENSE("GPL");
+1
drivers/pci/pci-stub.c
··· 92 92 module_init(pci_stub_init); 93 93 module_exit(pci_stub_exit); 94 94 95 + MODULE_DESCRIPTION("VM device assignment stub driver"); 95 96 MODULE_LICENSE("GPL"); 96 97 MODULE_AUTHOR("Chris Wright <chrisw@sous-sol.org>");
+1 -1
drivers/pci/pcie/portdrv.c
··· 786 786 787 787 static struct pci_driver pcie_portdriver = { 788 788 .name = "pcieport", 789 - .id_table = &port_pci_ids[0], 789 + .id_table = port_pci_ids, 790 790 791 791 .probe = pcie_portdrv_probe, 792 792 .remove = pcie_portdrv_remove,
+1 -1
drivers/usb/cdns3/cdnsp-pci.c
··· 231 231 232 232 static struct pci_driver cdnsp_pci_driver = { 233 233 .name = "cdnsp-pci", 234 - .id_table = &cdnsp_pci_ids[0], 234 + .id_table = cdnsp_pci_ids, 235 235 .probe = cdnsp_pci_probe, 236 236 .remove = cdnsp_pci_remove, 237 237 .driver = {
+1 -1
drivers/usb/gadget/udc/cdns2/cdns2-pci.c
··· 121 121 122 122 static struct pci_driver cdns2_pci_driver = { 123 123 .name = "cdns2-pci", 124 - .id_table = &cdns2_pci_ids[0], 124 + .id_table = cdns2_pci_ids, 125 125 .probe = cdns2_pci_probe, 126 126 .remove = cdns2_pci_remove, 127 127 .driver = {