Attachment 240245 Details for Bug 261912 – Minor update to -current

[patch] Minor update to -current

tbolt_update.diff (text/plain), 2.60 KB, created by Sean Bruno on 2023-02-18 23:01:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sean Bruno

Created: 2023-02-18 23:01:45 UTC

Size: 2.60 KB

patch

obsolete

>--- nhi_pci.c	2023-02-18 15:57:23.026356000 -0700
>+++ /usr/src/sys/dev/thunderbolt/nhi_pci.c	2023-02-18 15:25:53.671106000 -0700
>@@ -116,9 +116,7 @@
> 	{ 0, 0, 0, 0, 0, NULL }
> };
> 
>-static devclass_t	nhi_devclass;
>-DRIVER_MODULE_ORDERED(nhi, pci, nhi_pci_driver, nhi_devclass, NULL, NULL,
>-    SI_ORDER_ANY);
>+DRIVER_MODULE_ORDERED(nhi, pci, nhi_pci_driver, NULL, NULL, SI_ORDER_ANY);
> MODULE_PNP_INFO("U16:vendor;U16:device;V16:subvendor;V16:subdevice;U32:#;D:#",
>     pci, nhi, nhi_identifiers, nitems(nhi_identifiers) - 1);
> 
>--- nhi_wmi.c	2023-02-18 15:57:23.031214000 -0700
>+++ /usr/src/sys/dev/thunderbolt/nhi_wmi.c	2023-02-18 15:24:47.123119000 -0700
>@@ -83,10 +83,8 @@
> 	nhi_wmi_methods,
> 	sizeof(struct nhi_wmi_softc)
> };
>-static devclass_t nhi_wmi_devclass;
> 
>-DRIVER_MODULE(nhi_wmi, acpi_wmi, nhi_wmi_driver,
>-    nhi_wmi_devclass, 0, 0);
>+DRIVER_MODULE(nhi_wmi, acpi_wmi, nhi_wmi_driver, NULL, NULL);
> MODULE_DEPEND(nhi_wmi, acpi_wmi, 1, 1, 1);
> MODULE_DEPEND(nhi_wmi, acpi, 1, 1, 1);
> 
>--- tb_acpi_pcib.c	2023-02-18 15:57:23.039075000 -0700
>+++ /usr/src/sys/dev/thunderbolt/tb_acpi_pcib.c	2023-02-18 15:23:23.965779000 -0700
>@@ -179,10 +179,8 @@
> 	DEVMETHOD_END
> };
> 
>-static devclass_t	thunderbolt_devclass;
> 
> DEFINE_CLASS_2(tbolt, tb_acpi_pcib_driver, tb_acpi_pcib_methods,
>     sizeof(struct tb_pcib_softc), pcib_driver, tb_pcib_driver);
>-DRIVER_MODULE_ORDERED(tb_acpi_pcib, pci, tb_acpi_pcib_driver,
>-     thunderbolt_devclass, 0, 0, SI_ORDER_MIDDLE);
>+DRIVER_MODULE_ORDERED(tb_acpi_pcib, pci, tb_acpi_pcib_driver, NULL, NULL, SI_ORDER_MIDDLE);
> MODULE_DEPEND(tb_acpi_pcib, acpi, 1, 1, 1);
>--- tb_pcib.c	2023-02-18 15:57:23.048001000 -0700
>+++ /usr/src/sys/dev/thunderbolt/tb_pcib.c	2023-02-18 15:26:56.188732000 -0700
>@@ -549,11 +549,9 @@
> 	DEVMETHOD_END
> };
> 
>-static devclass_t	thunderbolt_devclass;
> DEFINE_CLASS_1(tbolt, tb_pcib_driver, tb_pcib_methods,
>     sizeof(struct tb_pcib_softc), pcib_driver);
>-DRIVER_MODULE_ORDERED(tb_pcib, pci, tb_pcib_driver, thunderbolt_devclass,
>-    NULL, NULL, SI_ORDER_MIDDLE);
>+DRIVER_MODULE_ORDERED(tb_pcib, pci, tb_pcib_driver,NULL, NULL, SI_ORDER_MIDDLE);
> MODULE_DEPEND(tb_pcib, pci, 1, 1, 1);
> MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice;U32:#;D:#",
>     pci, tb_pcib, tb_pcib_identifiers, nitems(tb_pcib_identifiers) - 1);
>@@ -612,10 +610,8 @@
> 	DEVMETHOD_END
> };
> 
>-static devclass_t pci_devclass;
>-
> DEFINE_CLASS_1(pci, tb_pci_driver, tb_pci_methods, sizeof(struct pci_softc),
>     pci_driver);
>-DRIVER_MODULE(tb_pci, pcib, tb_pci_driver, pci_devclass, 0, 0);
>+DRIVER_MODULE(tb_pci, pcib, tb_pci_driver, 0, 0);
> MODULE_DEPEND(tb_pci, pci, 1, 1, 1);
> MODULE_VERSION(tb_pci, 1);

Actions: View | Diff

Attachments on bug 261912: 233402 | 233403 | 240244 | 240245