Date: Tue, 27 Jan 2009 16:27:31 +0000 (UTC) From: Andrew Thompson <thompsa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r187777 - in user/thompsa/usb/sys/dev/usb2: bluetooth controller core ethernet input misc serial sound storage Message-ID: <200901271627.n0RGRVxK090966@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thompsa Date: Tue Jan 27 16:27:31 2009 New Revision: 187777 URL: http://svn.freebsd.org/changeset/base/187777 Log: Remove check of null softc in attach routines; it can never happen Modified: user/thompsa/usb/sys/dev/usb2/bluetooth/ubtbcmfw2.c user/thompsa/usb/sys/dev/usb2/controller/at91dci_atmelarm.c user/thompsa/usb/sys/dev/usb2/controller/ehci2_pci.c user/thompsa/usb/sys/dev/usb2/controller/musb2_otg_atmelarm.c user/thompsa/usb/sys/dev/usb2/controller/ohci2_atmelarm.c user/thompsa/usb/sys/dev/usb2/controller/ohci2_pci.c user/thompsa/usb/sys/dev/usb2/controller/uhci2_pci.c user/thompsa/usb/sys/dev/usb2/controller/uss820dci_atmelarm.c user/thompsa/usb/sys/dev/usb2/core/usb2_compat_linux.c user/thompsa/usb/sys/dev/usb2/core/usb2_hub.c user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c user/thompsa/usb/sys/dev/usb2/ethernet/if_cdce2.c user/thompsa/usb/sys/dev/usb2/ethernet/if_cue2.c user/thompsa/usb/sys/dev/usb2/ethernet/if_kue2.c user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c user/thompsa/usb/sys/dev/usb2/input/uhid2.c user/thompsa/usb/sys/dev/usb2/input/ukbd2.c user/thompsa/usb/sys/dev/usb2/misc/udbp2.c user/thompsa/usb/sys/dev/usb2/misc/ufm2.c user/thompsa/usb/sys/dev/usb2/serial/u3g2.c user/thompsa/usb/sys/dev/usb2/serial/uark2.c user/thompsa/usb/sys/dev/usb2/serial/ubsa2.c user/thompsa/usb/sys/dev/usb2/serial/ubser2.c user/thompsa/usb/sys/dev/usb2/serial/uchcom2.c user/thompsa/usb/sys/dev/usb2/serial/ucycom2.c user/thompsa/usb/sys/dev/usb2/serial/ufoma2.c user/thompsa/usb/sys/dev/usb2/serial/uftdi2.c user/thompsa/usb/sys/dev/usb2/serial/ugensa2.c user/thompsa/usb/sys/dev/usb2/serial/uipaq2.c user/thompsa/usb/sys/dev/usb2/serial/umct2.c user/thompsa/usb/sys/dev/usb2/serial/umodem2.c user/thompsa/usb/sys/dev/usb2/serial/umoscom2.c user/thompsa/usb/sys/dev/usb2/serial/uplcom2.c user/thompsa/usb/sys/dev/usb2/serial/uvisor2.c user/thompsa/usb/sys/dev/usb2/serial/uvscom2.c user/thompsa/usb/sys/dev/usb2/sound/uaudio2.c user/thompsa/usb/sys/dev/usb2/storage/ata-usb2.c user/thompsa/usb/sys/dev/usb2/storage/umass2.c user/thompsa/usb/sys/dev/usb2/storage/urio2.c user/thompsa/usb/sys/dev/usb2/storage/ustorage2_fs.c Modified: user/thompsa/usb/sys/dev/usb2/bluetooth/ubtbcmfw2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/bluetooth/ubtbcmfw2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/bluetooth/ubtbcmfw2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -216,9 +216,6 @@ ubtbcmfw_attach(device_t dev) int32_t err; uint8_t iface_index; - if (sc == NULL) { - return (ENOMEM); - } sc->sc_dev = dev; sc->sc_udev = uaa->device; Modified: user/thompsa/usb/sys/dev/usb2/controller/at91dci_atmelarm.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/controller/at91dci_atmelarm.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/controller/at91dci_atmelarm.c Tue Jan 27 16:27:31 2009 (r187777) @@ -131,9 +131,6 @@ at91_udp_attach(device_t dev) int err; int rid; - if (sc == NULL) { - return (ENXIO); - } /* setup AT9100 USB device controller interface softc */ sc->sc_dci.sc_clocks_on = &at91_udp_clocks_on; Modified: user/thompsa/usb/sys/dev/usb2/controller/ehci2_pci.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/controller/ehci2_pci.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/controller/ehci2_pci.c Tue Jan 27 16:27:31 2009 (r187777) @@ -227,10 +227,6 @@ ehci_pci_attach(device_t self) int err; int rid; - if (sc == NULL) { - device_printf(self, "Could not allocate sc\n"); - return (ENXIO); - } /* initialise some bus fields */ sc->sc_bus.parent = self; sc->sc_bus.devices = sc->sc_devices; Modified: user/thompsa/usb/sys/dev/usb2/controller/musb2_otg_atmelarm.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/controller/musb2_otg_atmelarm.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/controller/musb2_otg_atmelarm.c Tue Jan 27 16:27:31 2009 (r187777) @@ -90,11 +90,7 @@ musbotg_attach(device_t dev) int err; int rid; - if (sc == NULL) { - return (ENXIO); - } /* setup MUSB OTG USB controller interface softc */ - sc->sc_otg.sc_clocks_on = &musbotg_clocks_on; sc->sc_otg.sc_clocks_off = &musbotg_clocks_off; sc->sc_otg.sc_clocks_arg = sc; Modified: user/thompsa/usb/sys/dev/usb2/controller/ohci2_atmelarm.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/controller/ohci2_atmelarm.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/controller/ohci2_atmelarm.c Tue Jan 27 16:27:31 2009 (r187777) @@ -69,9 +69,6 @@ ohci_atmelarm_attach(device_t dev) int err; int rid; - if (sc == NULL) { - return (ENXIO); - } /* initialise some bus fields */ sc->sc_ohci.sc_bus.parent = dev; sc->sc_ohci.sc_bus.devices = sc->sc_ohci.sc_devices; Modified: user/thompsa/usb/sys/dev/usb2/controller/ohci2_pci.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/controller/ohci2_pci.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/controller/ohci2_pci.c Tue Jan 27 16:27:31 2009 (r187777) @@ -195,10 +195,6 @@ ohci_pci_attach(device_t self) int rid; int err; - if (sc == NULL) { - device_printf(self, "Could not allocate sc\n"); - return (ENXIO); - } /* initialise some bus fields */ sc->sc_bus.parent = self; sc->sc_bus.devices = sc->sc_devices; Modified: user/thompsa/usb/sys/dev/usb2/controller/uhci2_pci.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/controller/uhci2_pci.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/controller/uhci2_pci.c Tue Jan 27 16:27:31 2009 (r187777) @@ -246,10 +246,6 @@ uhci_pci_attach(device_t self) int rid; int err; - if (sc == NULL) { - device_printf(self, "Could not allocate sc\n"); - return (ENXIO); - } /* initialise some bus fields */ sc->sc_bus.parent = self; sc->sc_bus.devices = sc->sc_devices; Modified: user/thompsa/usb/sys/dev/usb2/controller/uss820dci_atmelarm.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/controller/uss820dci_atmelarm.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/controller/uss820dci_atmelarm.c Tue Jan 27 16:27:31 2009 (r187777) @@ -134,10 +134,6 @@ uss820_atmelarm_attach(device_t dev) int err; int rid; - if (sc == NULL) { - return (ENXIO); - } - /* initialise some bus fields */ sc->sc_bus.parent = dev; sc->sc_bus.devices = sc->sc_devices; Modified: user/thompsa/usb/sys/dev/usb2/core/usb2_compat_linux.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/core/usb2_compat_linux.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/core/usb2_compat_linux.c Tue Jan 27 16:27:31 2009 (r187777) @@ -246,9 +246,6 @@ usb_linux_attach(device_t dev) struct usb_device *p_dev; const struct usb_device_id *id = NULL; - if (sc == NULL) { - return (ENOMEM); - } mtx_lock(&Giant); LIST_FOREACH(udrv, &usb_linux_driver_list, linux_driver_list) { id = usb_linux_lookup_id(udrv->id_table, uaa); Modified: user/thompsa/usb/sys/dev/usb2/core/usb2_hub.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/core/usb2_hub.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/core/usb2_hub.c Tue Jan 27 16:27:31 2009 (r187777) @@ -649,9 +649,6 @@ uhub_attach(device_t dev) uint8_t iface_index; usb2_error_t err; - if (sc == NULL) { - return (ENOMEM); - } sc->sc_udev = udev; sc->sc_dev = dev; Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -697,9 +697,6 @@ aue_attach(device_t dev) uint8_t iface_index; int error; - if (sc == NULL) - return (ENOMEM); - sc->sc_udev = uaa->device; sc->sc_dev = dev; sc->sc_flags = USB_GET_DRIVER_INFO(uaa); Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -666,9 +666,6 @@ axe_attach(device_t dev) uint8_t iface_index; int error; - if (sc == NULL) - return (ENOMEM); - sc->sc_udev = uaa->device; sc->sc_dev = dev; sc->sc_flags = USB_GET_DRIVER_INFO(uaa); Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_cdce2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_cdce2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_cdce2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -228,9 +228,6 @@ cdce_attach(device_t dev) uint8_t eaddr[ETHER_ADDR_LEN]; char eaddr_str[5 * ETHER_ADDR_LEN]; /* approx */ - if (sc == NULL) { - return (ENOMEM); - } sc->sc_udev = uaa->device; sc->sc_dev = dev; sc->sc_flags = USB_GET_DRIVER_INFO(uaa); Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_cue2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_cue2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_cue2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -419,9 +419,6 @@ cue_attach(device_t dev) uint8_t iface_index; int error; - if (sc == NULL) - return (ENOMEM); - sc->sc_udev = uaa->device; sc->sc_dev = dev; Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_kue2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_kue2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_kue2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -467,9 +467,6 @@ kue_attach(device_t dev) uint8_t iface_index; int error; - if (sc == NULL) - return (ENOMEM); - sc->sc_udev = uaa->device; sc->sc_dev = dev; Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -628,9 +628,6 @@ rue_attach(device_t dev) uint8_t iface_index; int error; - if (sc == NULL) - return (ENOMEM); - sc->sc_udev = uaa->device; sc->sc_dev = dev; Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -255,9 +255,6 @@ udav_attach(device_t dev) uint8_t iface_index; int error; - if (sc == NULL) - return (ENOMEM); - sc->sc_udev = uaa->device; sc->sc_dev = dev; sc->sc_flags = USB_GET_DRIVER_INFO(uaa); Modified: user/thompsa/usb/sys/dev/usb2/input/uhid2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/input/uhid2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/input/uhid2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -660,9 +660,6 @@ uhid_attach(device_t dev) DPRINTFN(10, "sc=%p\n", sc); - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); mtx_init(&sc->sc_mtx, "uhid lock", NULL, MTX_DEF | MTX_RECURSE); Modified: user/thompsa/usb/sys/dev/usb2/input/ukbd2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/input/ukbd2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/input/ukbd2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -625,9 +625,6 @@ ukbd_attach(device_t dev) usb2_error_t err; uint16_t n; - if (sc == NULL) { - return (ENOMEM); - } mtx_assert(&Giant, MA_OWNED); kbd_init_struct(kbd, UKBD_DRIVER_NAME, KB_OTHER, unit, 0, 0, 0); Modified: user/thompsa/usb/sys/dev/usb2/misc/udbp2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/misc/udbp2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/misc/udbp2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -320,9 +320,6 @@ udbp_attach(device_t dev) struct udbp_softc *sc = device_get_softc(dev); int error; - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); snprintf(sc->sc_name, sizeof(sc->sc_name), Modified: user/thompsa/usb/sys/dev/usb2/misc/ufm2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/misc/ufm2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/misc/ufm2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -130,9 +130,6 @@ ufm_attach(device_t dev) struct ufm_softc *sc = device_get_softc(dev); int error; - if (sc == NULL) { - return (ENOMEM); - } sc->sc_udev = uaa->device; sc->sc_unit = device_get_unit(dev); Modified: user/thompsa/usb/sys/dev/usb2/serial/u3g2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/u3g2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/u3g2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -388,9 +388,6 @@ u3g_attach(device_t dev) DPRINTF("sc=%p\n", sc); - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); sc->sc_udev = uaa->device; Modified: user/thompsa/usb/sys/dev/usb2/serial/uark2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/uark2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/uark2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -209,9 +209,6 @@ uark_attach(device_t dev) int32_t error; uint8_t iface_index; - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); sc->sc_udev = uaa->device; Modified: user/thompsa/usb/sys/dev/usb2/serial/ubsa2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/ubsa2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/ubsa2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -329,9 +329,6 @@ ubsa_attach(device_t dev) DPRINTF("sc=%p\n", sc); - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); sc->sc_udev = uaa->device; Modified: user/thompsa/usb/sys/dev/usb2/serial/ubser2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/ubser2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/ubser2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -256,9 +256,6 @@ ubser_attach(device_t dev) uint8_t n; int error; - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); snprintf(sc->sc_name, sizeof(sc->sc_name), "%s", Modified: user/thompsa/usb/sys/dev/usb2/serial/uchcom2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/uchcom2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/uchcom2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -342,9 +342,6 @@ uchcom_attach(device_t dev) DPRINTFN(11, "\n"); - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); sc->sc_udev = uaa->device; Modified: user/thompsa/usb/sys/dev/usb2/serial/ucycom2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/ucycom2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/ucycom2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -216,9 +216,6 @@ ucycom_attach(device_t dev) uint16_t urd_len; uint8_t iface_index; - if (sc == NULL) { - return (ENOMEM); - } sc->sc_udev = uaa->device; device_set_usb2_desc(dev); Modified: user/thompsa/usb/sys/dev/usb2/serial/ufoma2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/ufoma2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/ufoma2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -407,9 +407,6 @@ ufoma_attach(device_t dev) uint8_t elements; int32_t error; - if (sc == NULL) { - return (ENOMEM); - } sc->sc_udev = uaa->device; sc->sc_dev = dev; sc->sc_unit = device_get_unit(dev); Modified: user/thompsa/usb/sys/dev/usb2/serial/uftdi2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/uftdi2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/uftdi2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -286,9 +286,6 @@ uftdi_attach(device_t dev) struct uftdi_softc *sc = device_get_softc(dev); int error; - if (sc == NULL) { - return (ENOMEM); - } sc->sc_udev = uaa->device; sc->sc_dev = dev; sc->sc_unit = device_get_unit(dev); Modified: user/thompsa/usb/sys/dev/usb2/serial/ugensa2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/ugensa2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/ugensa2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -215,9 +215,6 @@ ugensa_attach(device_t dev) uint8_t iface_index; int x, cnt; - if (sc == NULL) - return (ENOMEM); - device_set_usb2_desc(dev); mtx_init(&sc->sc_mtx, "ugensa", NULL, MTX_DEF); Modified: user/thompsa/usb/sys/dev/usb2/serial/uipaq2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/uipaq2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/uipaq2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -1129,9 +1129,6 @@ uipaq_attach(device_t dev) uint8_t iface_index; uint8_t i; - if (sc == NULL) { - return (ENOMEM); - } sc->sc_udev = uaa->device; device_set_usb2_desc(dev); Modified: user/thompsa/usb/sys/dev/usb2/serial/umct2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/umct2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/umct2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -273,9 +273,6 @@ umct_attach(device_t dev) uint16_t maxp; uint8_t iface_index; - if (sc == NULL) { - return (ENOMEM); - } sc->sc_udev = uaa->device; sc->sc_unit = device_get_unit(dev); Modified: user/thompsa/usb/sys/dev/usb2/serial/umodem2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/umodem2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/umodem2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -322,9 +322,6 @@ umodem_attach(device_t dev) uint8_t i; int error; - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); sc->sc_ctrl_iface_no = uaa->info.bIfaceNum; Modified: user/thompsa/usb/sys/dev/usb2/serial/umoscom2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/umoscom2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/umoscom2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -335,9 +335,6 @@ umoscom_attach(device_t dev) int error; uint8_t iface_index; - if (sc == NULL) { - return (ENOMEM); - } sc->sc_udev = uaa->device; sc->sc_mcr = 0x08; /* enable interrupts */ Modified: user/thompsa/usb/sys/dev/usb2/serial/uplcom2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/uplcom2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/uplcom2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -371,9 +371,6 @@ uplcom_attach(device_t dev) DPRINTFN(11, "\n"); - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); DPRINTF("sc = %p\n", sc); Modified: user/thompsa/usb/sys/dev/usb2/serial/uvisor2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/uvisor2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/uvisor2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -321,9 +321,6 @@ uvisor_attach(device_t dev) DPRINTF("sc=%p\n", sc); bcopy(uvisor_config, uvisor_config_copy, sizeof(uvisor_config_copy)); - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); sc->sc_udev = uaa->device; Modified: user/thompsa/usb/sys/dev/usb2/serial/uvscom2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/serial/uvscom2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/serial/uvscom2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -315,9 +315,6 @@ uvscom_attach(device_t dev) struct uvscom_softc *sc = device_get_softc(dev); int error; - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); sc->sc_udev = uaa->device; Modified: user/thompsa/usb/sys/dev/usb2/sound/uaudio2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/sound/uaudio2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/sound/uaudio2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -562,9 +562,6 @@ uaudio_attach(device_t dev) struct usb2_interface_descriptor *id; device_t child; - if (sc == NULL) { - return (ENOMEM); - } sc->sc_play_chan.priv_sc = sc; sc->sc_rec_chan.priv_sc = sc; sc->sc_udev = uaa->device; Modified: user/thompsa/usb/sys/dev/usb2/storage/ata-usb2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/storage/ata-usb2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/storage/ata-usb2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -328,9 +328,6 @@ atausb2_attach(device_t dev) uint8_t has_intr; int err; - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); sc->dev = dev; Modified: user/thompsa/usb/sys/dev/usb2/storage/umass2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/storage/umass2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/storage/umass2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -1440,9 +1440,6 @@ umass_attach(device_t dev) struct usb2_interface_descriptor *id; int32_t err; - if (sc == NULL) { - return (ENOMEM); - } if (device_get_unit(dev) >= UMASS_MAXUNIT) { device_printf(dev, "Maxunit(%u) limit reached!\n", UMASS_MAXUNIT); Modified: user/thompsa/usb/sys/dev/usb2/storage/urio2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/storage/urio2.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/storage/urio2.c Tue Jan 27 16:27:31 2009 (r187777) @@ -212,9 +212,6 @@ urio_attach(device_t dev) struct urio_softc *sc = device_get_softc(dev); int error; - if (sc == NULL) { - return (ENOMEM); - } device_set_usb2_desc(dev); sc->sc_udev = uaa->device; Modified: user/thompsa/usb/sys/dev/usb2/storage/ustorage2_fs.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/storage/ustorage2_fs.c Tue Jan 27 16:25:45 2009 (r187776) +++ user/thompsa/usb/sys/dev/usb2/storage/ustorage2_fs.c Tue Jan 27 16:27:31 2009 (r187777) @@ -318,9 +318,6 @@ ustorage_fs_attach(device_t dev) struct usb2_interface_descriptor *id; int err; - if (sc == NULL) { - return (ENOMEM); - } /* * NOTE: the softc struct is bzero-ed in device_set_driver. * We can safely call ustorage_fs_detach without specifically
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901271627.n0RGRVxK090966>