Skip to content

Commit

Permalink
Merge branch 'pci/misc'
Browse files Browse the repository at this point in the history
- 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'
  • Loading branch information
Bjorn Helgaas committed Jul 19, 2024
2 parents 19a3eec + 142a41d commit 4565927
Show file tree
Hide file tree
Showing 19 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Documentation/PCI/pciebus-howto.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion Documentation/translations/zh_CN/PCI/pciebus-howto.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 0 additions & 5 deletions drivers/acpi/pci_root.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions drivers/pci/controller/dwc/pci-exynos.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
1 change: 1 addition & 0 deletions drivers/pci/controller/pci-host-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
1 change: 1 addition & 0 deletions drivers/pci/controller/pci-host-generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,5 @@ static struct platform_driver gen_pci_driver = {
};
module_platform_driver(gen_pci_driver);

MODULE_DESCRIPTION("Generic PCI host controller driver");
MODULE_LICENSE("GPL v2");
1 change: 1 addition & 0 deletions drivers/pci/controller/pcie-altera-msi.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,4 +290,5 @@ static void __exit altera_msi_exit(void)
subsys_initcall(altera_msi_init);
MODULE_DEVICE_TABLE(of, altera_msi_of_match);
module_exit(altera_msi_exit);
MODULE_DESCRIPTION("Altera PCIe MSI support driver");
MODULE_LICENSE("GPL v2");
1 change: 1 addition & 0 deletions drivers/pci/controller/pcie-altera.c
Original file line number Diff line number Diff line change
Expand Up @@ -826,4 +826,5 @@ static struct platform_driver altera_pcie_driver = {

MODULE_DEVICE_TABLE(of, altera_pcie_of_match);
module_platform_driver(altera_pcie_driver);
MODULE_DESCRIPTION("Altera PCIe host controller driver");
MODULE_LICENSE("GPL v2");
1 change: 1 addition & 0 deletions drivers/pci/controller/pcie-apple.c
Original file line number Diff line number Diff line change
Expand Up @@ -839,4 +839,5 @@ static struct platform_driver apple_pcie_driver = {
};
module_platform_driver(apple_pcie_driver);

MODULE_DESCRIPTION("Apple PCIe host bridge driver");
MODULE_LICENSE("GPL v2");
1 change: 1 addition & 0 deletions drivers/pci/controller/pcie-mediatek-gen3.c
Original file line number Diff line number Diff line change
Expand Up @@ -1091,4 +1091,5 @@ static struct platform_driver mtk_pcie_driver = {
};

module_platform_driver(mtk_pcie_driver);
MODULE_DESCRIPTION("MediaTek Gen3 PCIe host controller driver");
MODULE_LICENSE("GPL v2");
1 change: 1 addition & 0 deletions drivers/pci/controller/pcie-mediatek.c
Original file line number Diff line number Diff line change
Expand Up @@ -1252,4 +1252,5 @@ static struct platform_driver mtk_pcie_driver = {
},
};
module_platform_driver(mtk_pcie_driver);
MODULE_DESCRIPTION("MediaTek PCIe host controller driver");
MODULE_LICENSE("GPL v2");
1 change: 1 addition & 0 deletions drivers/pci/controller/pcie-mt7621.c
Original file line number Diff line number Diff line change
Expand Up @@ -549,4 +549,5 @@ static struct platform_driver mt7621_pcie_driver = {
};
builtin_platform_driver(mt7621_pcie_driver);

MODULE_DESCRIPTION("MediaTek MT7621 PCIe host controller driver");
MODULE_LICENSE("GPL v2");
1 change: 1 addition & 0 deletions drivers/pci/controller/vmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1128,5 +1128,6 @@ static struct pci_driver vmd_drv = {
module_pci_driver(vmd_drv);

MODULE_AUTHOR("Intel Corporation");
MODULE_DESCRIPTION("Volume Management Device driver");
MODULE_LICENSE("GPL v2");
MODULE_VERSION("0.6");
4 changes: 2 additions & 2 deletions drivers/pci/pci-mid.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ pci_power_t mid_pci_get_power_state(struct pci_dev *pdev)
* arch/x86/platform/intel-mid/pwr.c.
*/
static const struct x86_cpu_id lpss_cpu_ids[] = {
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, NULL),
X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, NULL),
X86_MATCH_VFM(INTEL_ATOM_SALTWELL_MID, NULL),
X86_MATCH_VFM(INTEL_ATOM_SILVERMONT_MID, NULL),
{}
};

Expand Down
1 change: 1 addition & 0 deletions drivers/pci/pci-pf-stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ static struct pci_driver pf_stub_driver = {
};
module_pci_driver(pf_stub_driver);

MODULE_DESCRIPTION("SR-IOV PF stub driver with no functionality");
MODULE_LICENSE("GPL");
1 change: 1 addition & 0 deletions drivers/pci/pci-stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,6 @@ static void __exit pci_stub_exit(void)
module_init(pci_stub_init);
module_exit(pci_stub_exit);

MODULE_DESCRIPTION("VM device assignment stub driver");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Chris Wright <chrisw@sous-sol.org>");
2 changes: 1 addition & 1 deletion drivers/pci/pcie/portdrv.c
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ static const struct pci_error_handlers pcie_portdrv_err_handler = {

static struct pci_driver pcie_portdriver = {
.name = "pcieport",
.id_table = &port_pci_ids[0],
.id_table = port_pci_ids,

.probe = pcie_portdrv_probe,
.remove = pcie_portdrv_remove,
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/cdns3/cdnsp-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ static const struct pci_device_id cdnsp_pci_ids[] = {

static struct pci_driver cdnsp_pci_driver = {
.name = "cdnsp-pci",
.id_table = &cdnsp_pci_ids[0],
.id_table = cdnsp_pci_ids,
.probe = cdnsp_pci_probe,
.remove = cdnsp_pci_remove,
.driver = {
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/udc/cdns2/cdns2-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ static const struct pci_device_id cdns2_pci_ids[] = {

static struct pci_driver cdns2_pci_driver = {
.name = "cdns2-pci",
.id_table = &cdns2_pci_ids[0],
.id_table = cdns2_pci_ids,
.probe = cdns2_pci_probe,
.remove = cdns2_pci_remove,
.driver = {
Expand Down

0 comments on commit 4565927

Please sign in to comment.