diff options
| author | jdolecek <jdolecek@NetBSD.org> | 2017-10-20 07:06:05 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek@NetBSD.org> | 2017-10-20 07:06:05 +0000 |
| commit | a1bf30e8664357bafc3ccae2f9fd0a82b80da38d (patch) | |
| tree | bbe67330ed63b1c91a85eaa6f8e1a5164678e218 /sys/dev/usb | |
| parent | ad78d490fdb1c20addcc0d39920b7609a2133ad9 (diff) | |
move ata_queue_alloc(1) and ata_queue_free() calls to ata_channel_init()
and ata_channel_destroy() respectively, to make attachment code simpler,
and to make it easier to spot special queue manipulation like cmdide(4)
on topic of PR kern/52606
Diffstat (limited to 'sys/dev/usb')
| -rw-r--r-- | sys/dev/usb/umass_isdata.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/dev/usb/umass_isdata.c b/sys/dev/usb/umass_isdata.c index 2796b3d849f..87e729a4dcf 100644 --- a/sys/dev/usb/umass_isdata.c +++ b/sys/dev/usb/umass_isdata.c @@ -1,4 +1,4 @@ -/* $NetBSD: umass_isdata.c,v 1.35 2017/10/10 16:44:24 jdolecek Exp $ */ +/* $NetBSD: umass_isdata.c,v 1.36 2017/10/20 07:06:08 jdolecek Exp $ */ /* * TODO: @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.35 2017/10/10 16:44:24 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.36 2017/10/20 07:06:08 jdolecek Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -223,7 +223,6 @@ umass_isdata_attach(struct umass_softc *sc) /* Fake ATA channel so wd(4) ata_{get,free}_xfer() work */ ata_channel_init(&scbus->sc_channel); scbus->sc_channel.atabus = (device_t)scbus; - scbus->sc_channel.ch_queue = ata_queue_alloc(1); scbus->sc_drv_data.drive_type = ATA_DRIVET_ATA; scbus->sc_drv_data.chnl_softc = &scbus->sc_channel; @@ -238,9 +237,6 @@ umass_isdata_detach(struct umass_softc *sc) { struct uisdata_softc *scbus = (struct uisdata_softc *)sc->bus; - ata_queue_free(scbus->sc_channel.ch_queue); - scbus->sc_channel.ch_queue = NULL; - ata_channel_destroy(&scbus->sc_channel); } |
