From owner-svn-src-user@FreeBSD.ORG Sun Nov 2 02:56:17 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BFAFC106564A; Sun, 2 Nov 2008 02:56:17 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A67C48FC12; Sun, 2 Nov 2008 02:56:17 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mA22uHEN026788; Sun, 2 Nov 2008 02:56:17 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mA22uG1i026765; Sun, 2 Nov 2008 02:56:16 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200811020256.mA22uG1i026765@svn.freebsd.org> From: Warner Losh Date: Sun, 2 Nov 2008 02:56:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184549 - in user/imp/newcard/sys: dev/aic7xxx dev/ath dev/dc dev/firewire dev/fxp dev/if_ndis dev/ipw dev/malo dev/puc dev/ral dev/re dev/sio dev/sound/pci dev/uart dev/usb dev/vge dev... X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Nov 2008 02:56:17 -0000 Author: imp Date: Sun Nov 2 02:56:16 2008 New Revision: 184549 URL: http://svn.freebsd.org/changeset/base/184549 Log: MFp4(newcard): remove explicit cardbus driver attachments. Since the pci/cardbus refactor, these have been unnecessary. Well, almost unnecessary. There's a bug somewhere in subr_bus.c that prevents kldload from working entirely correctly. Remove them from my tree in the hopes I'll fix that bug. Modified: user/imp/newcard/sys/dev/aic7xxx/ahc_pci.c user/imp/newcard/sys/dev/aic7xxx/ahd_pci.c user/imp/newcard/sys/dev/ath/if_ath_pci.c user/imp/newcard/sys/dev/dc/if_dc.c user/imp/newcard/sys/dev/firewire/fwohci_pci.c user/imp/newcard/sys/dev/fxp/if_fxp.c user/imp/newcard/sys/dev/if_ndis/if_ndis_pci.c user/imp/newcard/sys/dev/ipw/if_ipw.c user/imp/newcard/sys/dev/malo/if_malo_pci.c user/imp/newcard/sys/dev/puc/puc_pci.c user/imp/newcard/sys/dev/ral/if_ral_pci.c user/imp/newcard/sys/dev/re/if_re.c user/imp/newcard/sys/dev/sio/sio_pci.c user/imp/newcard/sys/dev/sound/pci/emu10k1.c user/imp/newcard/sys/dev/sound/pci/emu10kx.c user/imp/newcard/sys/dev/uart/uart_bus_pci.c user/imp/newcard/sys/dev/usb/ehci_pci.c user/imp/newcard/sys/dev/usb/ohci_pci.c user/imp/newcard/sys/dev/usb/uhci_pci.c user/imp/newcard/sys/dev/vge/if_vge.c user/imp/newcard/sys/dev/xl/if_xl.c user/imp/newcard/sys/pci/if_rl.c Modified: user/imp/newcard/sys/dev/aic7xxx/ahc_pci.c ============================================================================== --- user/imp/newcard/sys/dev/aic7xxx/ahc_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/aic7xxx/ahc_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -54,7 +54,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); Modified: user/imp/newcard/sys/dev/aic7xxx/ahd_pci.c ============================================================================== --- user/imp/newcard/sys/dev/aic7xxx/ahd_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/aic7xxx/ahd_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -56,7 +56,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); Modified: user/imp/newcard/sys/dev/ath/if_ath_pci.c ============================================================================== --- user/imp/newcard/sys/dev/ath/if_ath_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/ath/if_ath_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -252,7 +252,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 */ Modified: user/imp/newcard/sys/dev/dc/if_dc.c ============================================================================== --- user/imp/newcard/sys/dev/dc/if_dc.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/dc/if_dc.c Sun Nov 2 02:56:16 2008 (r184549) @@ -331,7 +331,6 @@ static driver_t dc_driver = { static devclass_t dc_devclass; -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); Modified: user/imp/newcard/sys/dev/firewire/fwohci_pci.c ============================================================================== --- user/imp/newcard/sys/dev/firewire/fwohci_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/firewire/fwohci_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -556,4 +556,3 @@ static devclass_t fwohci_devclass; MODULE_DEPEND(fwohci, firewire, 1, 1, 1); #endif DRIVER_MODULE(fwohci, pci, fwohci_driver, fwohci_devclass, 0, 0); -DRIVER_MODULE(fwohci, cardbus, fwohci_driver, fwohci_devclass, 0, 0); Modified: user/imp/newcard/sys/dev/fxp/if_fxp.c ============================================================================== --- user/imp/newcard/sys/dev/fxp/if_fxp.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/fxp/if_fxp.c Sun Nov 2 02:56:16 2008 (r184549) @@ -288,7 +288,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 struct resource_spec fxp_res_spec_mem[] = { Modified: user/imp/newcard/sys/dev/if_ndis/if_ndis_pci.c ============================================================================== --- user/imp/newcard/sys/dev/if_ndis/if_ndis_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/if_ndis/if_ndis_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -101,7 +101,6 @@ static driver_t ndis_driver = { static devclass_t ndis_devclass; DRIVER_MODULE(ndis, pci, ndis_driver, ndis_devclass, ndisdrv_modevent, 0); -DRIVER_MODULE(ndis, cardbus, ndis_driver, ndis_devclass, ndisdrv_modevent, 0); static int ndis_devcompare(bustype, t, dev) Modified: user/imp/newcard/sys/dev/ipw/if_ipw.c ============================================================================== --- user/imp/newcard/sys/dev/ipw/if_ipw.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/ipw/if_ipw.c Sun Nov 2 02:56:16 2008 (r184549) @@ -203,7 +203,6 @@ static driver_t ipw_driver = { static devclass_t ipw_devclass; DRIVER_MODULE(ipw, pci, ipw_driver, ipw_devclass, 0, 0); -DRIVER_MODULE(ipw, cardbus, ipw_driver, ipw_devclass, 0, 0); static int ipw_probe(device_t dev) Modified: user/imp/newcard/sys/dev/malo/if_malo_pci.c ============================================================================== --- user/imp/newcard/sys/dev/malo/if_malo_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/malo/if_malo_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -367,7 +367,6 @@ static driver_t malo_pci_driver = { static devclass_t malo_devclass; DRIVER_MODULE(if_malo, pci, malo_pci_driver, malo_devclass, 0, 0); -DRIVER_MODULE(if_malo, cardbus, malo_pci_driver, malo_devclass, 0, 0); MODULE_VERSION(if_malo, 1); MODULE_DEPEND(if_malo, wlan, 1, 1, 1); /* 802.11 media layer */ MODULE_DEPEND(if_malo, malofw_fw, 1, 1, 1); Modified: user/imp/newcard/sys/dev/puc/puc_pci.c ============================================================================== --- user/imp/newcard/sys/dev/puc/puc_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/puc/puc_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -144,4 +144,3 @@ 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); Modified: user/imp/newcard/sys/dev/ral/if_ral_pci.c ============================================================================== --- user/imp/newcard/sys/dev/ral/if_ral_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/ral/if_ral_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -145,7 +145,6 @@ static driver_t ral_pci_driver = { static devclass_t ral_devclass; DRIVER_MODULE(ral, pci, ral_pci_driver, ral_devclass, 0, 0); -DRIVER_MODULE(ral, cardbus, ral_pci_driver, ral_devclass, 0, 0); static int ral_pci_probe(device_t dev) Modified: user/imp/newcard/sys/dev/re/if_re.c ============================================================================== --- user/imp/newcard/sys/dev/re/if_re.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/re/if_re.c Sun Nov 2 02:56:16 2008 (r184549) @@ -304,7 +304,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) \ Modified: user/imp/newcard/sys/dev/sio/sio_pci.c ============================================================================== --- user/imp/newcard/sys/dev/sio/sio_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/sio/sio_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -155,4 +155,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); Modified: user/imp/newcard/sys/dev/sound/pci/emu10k1.c ============================================================================== --- user/imp/newcard/sys/dev/sound/pci/emu10k1.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/sound/pci/emu10k1.c Sun Nov 2 02:56:16 2008 (r184549) @@ -2109,7 +2109,6 @@ static driver_t emu_driver = { }; DRIVER_MODULE(snd_emu10k1, pci, emu_driver, pcm_devclass, 0, 0); -DRIVER_MODULE(snd_emu10k1, cardbus, emu_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_emu10k1, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); MODULE_VERSION(snd_emu10k1, 1); MODULE_DEPEND(snd_emu10k1, midi, 1, 1, 1); Modified: user/imp/newcard/sys/dev/sound/pci/emu10kx.c ============================================================================== --- user/imp/newcard/sys/dev/sound/pci/emu10kx.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/sound/pci/emu10kx.c Sun Nov 2 02:56:16 2008 (r184549) @@ -3556,5 +3556,4 @@ emu_modevent(module_t mod __unused, int static devclass_t emu_devclass; DRIVER_MODULE(snd_emu10kx, pci, emu_driver, emu_devclass, emu_modevent, NULL); -DRIVER_MODULE(snd_emu10kx, cardbus, emu_driver, emu_devclass, emu_modevent, NULL); MODULE_VERSION(snd_emu10kx, SND_EMU10KX_PREFVER); Modified: user/imp/newcard/sys/dev/uart/uart_bus_pci.c ============================================================================== --- user/imp/newcard/sys/dev/uart/uart_bus_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/uart/uart_bus_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -158,4 +158,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); Modified: user/imp/newcard/sys/dev/usb/ehci_pci.c ============================================================================== --- user/imp/newcard/sys/dev/usb/ehci_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/usb/ehci_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -622,5 +622,4 @@ 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); MODULE_DEPEND(ehci, usb, 1, 1, 1); Modified: user/imp/newcard/sys/dev/usb/ohci_pci.c ============================================================================== --- user/imp/newcard/sys/dev/usb/ohci_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/usb/ohci_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -407,5 +407,4 @@ 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); MODULE_DEPEND(ohci, usb, 1, 1, 1); Modified: user/imp/newcard/sys/dev/usb/uhci_pci.c ============================================================================== --- user/imp/newcard/sys/dev/usb/uhci_pci.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/usb/uhci_pci.c Sun Nov 2 02:56:16 2008 (r184549) @@ -514,5 +514,4 @@ 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); MODULE_DEPEND(uhci, usb, 1, 1, 1); Modified: user/imp/newcard/sys/dev/vge/if_vge.c ============================================================================== --- user/imp/newcard/sys/dev/vge/if_vge.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/vge/if_vge.c Sun Nov 2 02:56:16 2008 (r184549) @@ -221,7 +221,6 @@ static driver_t vge_driver = { static devclass_t vge_devclass; DRIVER_MODULE(vge, pci, vge_driver, vge_devclass, 0, 0); -DRIVER_MODULE(vge, cardbus, vge_driver, vge_devclass, 0, 0); DRIVER_MODULE(miibus, vge, miibus_driver, miibus_devclass, 0, 0); #ifdef VGE_EEPROM Modified: user/imp/newcard/sys/dev/xl/if_xl.c ============================================================================== --- user/imp/newcard/sys/dev/xl/if_xl.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/dev/xl/if_xl.c Sun Nov 2 02:56:16 2008 (r184549) @@ -314,7 +314,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); Modified: user/imp/newcard/sys/pci/if_rl.c ============================================================================== --- user/imp/newcard/sys/pci/if_rl.c Sun Nov 2 01:28:47 2008 (r184548) +++ user/imp/newcard/sys/pci/if_rl.c Sun Nov 2 02:56:16 2008 (r184549) @@ -261,7 +261,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) \