summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/dev
diff options
context:
space:
mode:
authorjdolecek <jdolecek@NetBSD.org>2017-10-20 07:06:05 +0000
committerjdolecek <jdolecek@NetBSD.org>2017-10-20 07:06:05 +0000
commita1bf30e8664357bafc3ccae2f9fd0a82b80da38d (patch)
treebbe67330ed63b1c91a85eaa6f8e1a5164678e218 /sys/arch/macppc/dev
parentad78d490fdb1c20addcc0d39920b7609a2133ad9 (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/arch/macppc/dev')
-rw-r--r--sys/arch/macppc/dev/kauai.c6
-rw-r--r--sys/arch/macppc/dev/wdc_obio.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/macppc/dev/kauai.c b/sys/arch/macppc/dev/kauai.c
index b5b3f55b2d3..ac6566a960f 100644
--- a/sys/arch/macppc/dev/kauai.c
+++ b/sys/arch/macppc/dev/kauai.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kauai.c,v 1.37 2017/10/07 16:05:32 jdolecek Exp $ */
+/* $NetBSD: kauai.c,v 1.38 2017/10/20 07:06:07 jdolecek Exp $ */
/*-
* Copyright (c) 2003 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.37 2017/10/07 16:05:32 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.38 2017/10/20 07:06:07 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -211,7 +211,7 @@ kauai_attach(device_t parent, device_t self, void *aux)
chp->ch_channel = 0;
chp->ch_atac = &sc->sc_wdcdev.sc_atac;
- chp->ch_queue = ata_queue_alloc(1);
+
wdc_init_shadow_regs(wdr);
wdcattach(chp);
diff --git a/sys/arch/macppc/dev/wdc_obio.c b/sys/arch/macppc/dev/wdc_obio.c
index 6b3db68aa90..dde436ed14f 100644
--- a/sys/arch/macppc/dev/wdc_obio.c
+++ b/sys/arch/macppc/dev/wdc_obio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_obio.c,v 1.60 2017/10/07 16:05:32 jdolecek Exp $ */
+/* $NetBSD: wdc_obio.c,v 1.61 2017/10/20 07:06:07 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.60 2017/10/07 16:05:32 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.61 2017/10/20 07:06:07 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -236,9 +236,9 @@ wdc_obio_attach(device_t parent, device_t self, void *aux)
sc->sc_wdcdev.dma_init = wdc_obio_dma_init;
sc->sc_wdcdev.dma_start = wdc_obio_dma_start;
sc->sc_wdcdev.dma_finish = wdc_obio_dma_finish;
+
chp->ch_channel = 0;
chp->ch_atac = &sc->sc_wdcdev.sc_atac;
- chp->ch_queue = ata_queue_alloc(1);
wdc_init_shadow_regs(wdr);