Remove explicit cardbus attachments from drivers where this is identical
to the pci attachment. Cardbus is a derived class of pci so all pci drivers are automatically available for matching against cardbus devices. Reviewed by: imp
This commit is contained in:
parent
77e03e16c9
commit
ae13306183
@ -57,7 +57,6 @@ static driver_t ahc_pci_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(ahc_pci, pci, ahc_pci_driver, ahc_devclass, 0, 0);
|
||||
DRIVER_MODULE(ahc_pci, cardbus, ahc_pci_driver, ahc_devclass, 0, 0);
|
||||
MODULE_DEPEND(ahc_pci, ahc, 1, 1, 1);
|
||||
MODULE_VERSION(ahc_pci, 1);
|
||||
|
||||
|
@ -60,7 +60,6 @@ static driver_t ahd_pci_driver = {
|
||||
static devclass_t ahd_devclass;
|
||||
|
||||
DRIVER_MODULE(ahd, pci, ahd_pci_driver, ahd_devclass, 0, 0);
|
||||
DRIVER_MODULE(ahd, cardbus, ahd_pci_driver, ahd_devclass, 0, 0);
|
||||
MODULE_DEPEND(ahd_pci, ahd, 1, 1, 1);
|
||||
MODULE_VERSION(ahd_pci, 1);
|
||||
|
||||
|
@ -296,7 +296,6 @@ static driver_t ath_pci_driver = {
|
||||
};
|
||||
static devclass_t ath_devclass;
|
||||
DRIVER_MODULE(if_ath, pci, ath_pci_driver, ath_devclass, 0, 0);
|
||||
DRIVER_MODULE(if_ath, cardbus, ath_pci_driver, ath_devclass, 0, 0);
|
||||
MODULE_VERSION(if_ath, 1);
|
||||
MODULE_DEPEND(if_ath, ath_hal, 1, 1, 1); /* Atheros HAL */
|
||||
MODULE_DEPEND(if_ath, wlan, 1, 1, 1); /* 802.11 media layer */
|
||||
|
@ -332,7 +332,6 @@ SYSCTL_INT(_hw, OID_AUTO, dc_quick, CTLFLAG_RW, &dc_quick, 0,
|
||||
"do not m_devget() in dc driver");
|
||||
#endif
|
||||
|
||||
DRIVER_MODULE(dc, cardbus, dc_driver, dc_devclass, 0, 0);
|
||||
DRIVER_MODULE(dc, pci, dc_driver, dc_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
|
@ -462,4 +462,3 @@ static driver_t fwohci_driver = {
|
||||
static devclass_t fwohci_devclass;
|
||||
|
||||
DRIVER_MODULE(fwohci, pci, fwohci_driver, fwohci_devclass, 0, 0);
|
||||
DRIVER_MODULE(fwohci, cardbus, fwohci_driver, fwohci_devclass, 0, 0);
|
||||
|
@ -279,7 +279,6 @@ static driver_t fxp_driver = {
|
||||
static devclass_t fxp_devclass;
|
||||
|
||||
DRIVER_MODULE(fxp, pci, fxp_driver, fxp_devclass, 0, 0);
|
||||
DRIVER_MODULE(fxp, cardbus, fxp_driver, fxp_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, fxp, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
static int fxp_rnr;
|
||||
|
@ -164,7 +164,6 @@ static driver_t puc_pci_driver = {
|
||||
};
|
||||
|
||||
DRIVER_MODULE(puc, pci, puc_pci_driver, puc_devclass, 0, 0);
|
||||
DRIVER_MODULE(puc, cardbus, puc_pci_driver, puc_devclass, 0, 0);
|
||||
|
||||
|
||||
#define rdspio(indx) (bus_space_write_1(bst, bsh, efir, indx), \
|
||||
|
@ -269,7 +269,6 @@ static driver_t re_driver = {
|
||||
static devclass_t re_devclass;
|
||||
|
||||
DRIVER_MODULE(re, pci, re_driver, re_devclass, 0, 0);
|
||||
DRIVER_MODULE(re, cardbus, re_driver, re_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, re, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define EE_SET(x) \
|
||||
|
@ -160,4 +160,3 @@ sio_pci_probe(dev)
|
||||
}
|
||||
|
||||
DRIVER_MODULE(sio, pci, sio_pci_driver, sio_devclass, 0, 0);
|
||||
DRIVER_MODULE(sio, cardbus, sio_pci_driver, sio_devclass, 0, 0);
|
||||
|
@ -115,4 +115,3 @@ uart_pci_probe(device_t dev)
|
||||
}
|
||||
|
||||
DRIVER_MODULE(uart, pci, uart_pci_driver, uart_devclass, 0, 0);
|
||||
DRIVER_MODULE(uart, cardbus, uart_pci_driver, uart_devclass, 0, 0);
|
||||
|
@ -334,4 +334,3 @@ static driver_t ehci_driver = {
|
||||
static devclass_t ehci_devclass;
|
||||
|
||||
DRIVER_MODULE(ehci, pci, ehci_driver, ehci_devclass, 0, 0);
|
||||
DRIVER_MODULE(ehci, cardbus, ehci_driver, ehci_devclass, 0, 0);
|
||||
|
@ -325,4 +325,3 @@ static driver_t ohci_driver = {
|
||||
static devclass_t ohci_devclass;
|
||||
|
||||
DRIVER_MODULE(ohci, pci, ohci_driver, ohci_devclass, 0, 0);
|
||||
DRIVER_MODULE(ohci, cardbus, ohci_driver, ohci_devclass, 0, 0);
|
||||
|
@ -412,4 +412,3 @@ static driver_t uhci_driver = {
|
||||
static devclass_t uhci_devclass;
|
||||
|
||||
DRIVER_MODULE(uhci, pci, uhci_driver, uhci_devclass, 0, 0);
|
||||
DRIVER_MODULE(uhci, cardbus, uhci_driver, uhci_devclass, 0, 0);
|
||||
|
@ -332,7 +332,6 @@ SYSCTL_INT(_hw, OID_AUTO, dc_quick, CTLFLAG_RW, &dc_quick, 0,
|
||||
"do not m_devget() in dc driver");
|
||||
#endif
|
||||
|
||||
DRIVER_MODULE(dc, cardbus, dc_driver, dc_devclass, 0, 0);
|
||||
DRIVER_MODULE(dc, pci, dc_driver, dc_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, dc, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
|
@ -253,7 +253,6 @@ static driver_t rl_driver = {
|
||||
static devclass_t rl_devclass;
|
||||
|
||||
DRIVER_MODULE(rl, pci, rl_driver, rl_devclass, 0, 0);
|
||||
DRIVER_MODULE(rl, cardbus, rl_driver, rl_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, rl, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
#define EE_SET(x) \
|
||||
|
@ -293,7 +293,6 @@ static driver_t xl_driver = {
|
||||
|
||||
static devclass_t xl_devclass;
|
||||
|
||||
DRIVER_MODULE(xl, cardbus, xl_driver, xl_devclass, 0, 0);
|
||||
DRIVER_MODULE(xl, pci, xl_driver, xl_devclass, 0, 0);
|
||||
DRIVER_MODULE(miibus, xl, miibus_driver, miibus_devclass, 0, 0);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user