Attachment #240245 for bug #261912

View | Details | Raw Unified | Return to bug 261912
Collapse All | Expand All

Lines 116-124 Link Here

(-)/usr/src/sys/dev/thunderbolt/nhi_pci.c (-3 / +1 lines)
116	{ 0, 0, 0, 0, 0, NULL }	116	{ 0, 0, 0, 0, 0, NULL }
117	};	117	};
118		118
119	static devclass_t nhi_devclass;	119	DRIVER_MODULE_ORDERED(nhi, pci, nhi_pci_driver, NULL, NULL, SI_ORDER_ANY);
120	DRIVER_MODULE_ORDERED(nhi, pci, nhi_pci_driver, nhi_devclass, NULL, NULL,
121	SI_ORDER_ANY);
122	MODULE_PNP_INFO("U16:vendor;U16:device;V16:subvendor;V16:subdevice;U32:#;D:#",	120	MODULE_PNP_INFO("U16:vendor;U16:device;V16:subvendor;V16:subdevice;U32:#;D:#",
123	pci, nhi, nhi_identifiers, nitems(nhi_identifiers) - 1);	121	pci, nhi, nhi_identifiers, nitems(nhi_identifiers) - 1);
124		122

Lines 83-92 Link Here

(-)/usr/src/sys/dev/thunderbolt/nhi_wmi.c (-3 / +1 lines)
83	nhi_wmi_methods,	83	nhi_wmi_methods,
84	sizeof(struct nhi_wmi_softc)	84	sizeof(struct nhi_wmi_softc)
85	};	85	};
86	static devclass_t nhi_wmi_devclass;
87		86
88	DRIVER_MODULE(nhi_wmi, acpi_wmi, nhi_wmi_driver,	87	DRIVER_MODULE(nhi_wmi, acpi_wmi, nhi_wmi_driver, NULL, NULL);
89	nhi_wmi_devclass, 0, 0);
90	MODULE_DEPEND(nhi_wmi, acpi_wmi, 1, 1, 1);	88	MODULE_DEPEND(nhi_wmi, acpi_wmi, 1, 1, 1);
91	MODULE_DEPEND(nhi_wmi, acpi, 1, 1, 1);	89	MODULE_DEPEND(nhi_wmi, acpi, 1, 1, 1);
92		90

Lines 179-188 Link Here

(-)/usr/src/sys/dev/thunderbolt/tb_acpi_pcib.c (-3 / +1 lines)
179	DEVMETHOD_END	179	DEVMETHOD_END
180	};	180	};
181		181
182	static devclass_t thunderbolt_devclass;
183		182
184	DEFINE_CLASS_2(tbolt, tb_acpi_pcib_driver, tb_acpi_pcib_methods,	183	DEFINE_CLASS_2(tbolt, tb_acpi_pcib_driver, tb_acpi_pcib_methods,
185	sizeof(struct tb_pcib_softc), pcib_driver, tb_pcib_driver);	184	sizeof(struct tb_pcib_softc), pcib_driver, tb_pcib_driver);
186	DRIVER_MODULE_ORDERED(tb_acpi_pcib, pci, tb_acpi_pcib_driver,	185	DRIVER_MODULE_ORDERED(tb_acpi_pcib, pci, tb_acpi_pcib_driver, NULL, NULL, SI_ORDER_MIDDLE);
187	thunderbolt_devclass, 0, 0, SI_ORDER_MIDDLE);
188	MODULE_DEPEND(tb_acpi_pcib, acpi, 1, 1, 1);	186	MODULE_DEPEND(tb_acpi_pcib, acpi, 1, 1, 1);




	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,NULL, NULL, SI_ORDER_MIDDLE);
    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);

	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, 0, 0);
MODULE_DEPEND(tb_pci, pci, 1, 1, 1);
MODULE_VERSION(tb_pci, 1);

Return to bug 261912

Lines 549-559 Link Here

(-)/usr/src/sys/dev/thunderbolt/tb_pcib.c (-6 / +2 lines)
549	DEVMETHOD_END	549	DEVMETHOD_END
550	};	550	};
551		551
552	static devclass_t thunderbolt_devclass;
553	DEFINE_CLASS_1(tbolt, tb_pcib_driver, tb_pcib_methods,	552	DEFINE_CLASS_1(tbolt, tb_pcib_driver, tb_pcib_methods,
554	sizeof(struct tb_pcib_softc), pcib_driver);	553	sizeof(struct tb_pcib_softc), pcib_driver);
555	DRIVER_MODULE_ORDERED(tb_pcib, pci, tb_pcib_driver, thunderbolt_devclass,	554	DRIVER_MODULE_ORDERED(tb_pcib, pci, tb_pcib_driver,NULL, NULL, SI_ORDER_MIDDLE);
556	NULL, NULL, SI_ORDER_MIDDLE);
557	MODULE_DEPEND(tb_pcib, pci, 1, 1, 1);	555	MODULE_DEPEND(tb_pcib, pci, 1, 1, 1);
558	MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice;U32:#;D:#",	556	MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice;U32:#;D:#",
559	pci, tb_pcib, tb_pcib_identifiers, nitems(tb_pcib_identifiers) - 1);	557	pci, tb_pcib, tb_pcib_identifiers, nitems(tb_pcib_identifiers) - 1);
Lines 612-621 Link Here
612	DEVMETHOD_END	610	DEVMETHOD_END
613	};	611	};
614		612
615	static devclass_t pci_devclass;
616
617	DEFINE_CLASS_1(pci, tb_pci_driver, tb_pci_methods, sizeof(struct pci_softc),	613	DEFINE_CLASS_1(pci, tb_pci_driver, tb_pci_methods, sizeof(struct pci_softc),
618	pci_driver);	614	pci_driver);
619	DRIVER_MODULE(tb_pci, pcib, tb_pci_driver, pci_devclass, 0, 0);	615	DRIVER_MODULE(tb_pci, pcib, tb_pci_driver, 0, 0);
620	MODULE_DEPEND(tb_pci, pci, 1, 1, 1);	616	MODULE_DEPEND(tb_pci, pci, 1, 1, 1);
621	MODULE_VERSION(tb_pci, 1);	617	MODULE_VERSION(tb_pci, 1);