From e32de526f819785b55f20dbc924e5aa09680c4f9 Mon Sep 17 00:00:00 2001
From: jakllsch <jakllsch@NetBSD.org>
Date: Mon, 7 Oct 2013 19:51:55 +0000
Subject: [PATCH] Use the universal pciide_detach() for detach function of all
 remaining pciide-core drivers, except pciide at pnpbios which isn't actually
 PCI.

---
 sys/arch/i386/pci/gcscide.c | 6 +++---
 sys/dev/pci/acardide.c      | 6 +++---
 sys/dev/pci/aceride.c       | 6 +++---
 sys/dev/pci/artsata.c       | 6 +++---
 sys/dev/pci/cypide.c        | 6 +++---
 sys/dev/pci/geodeide.c      | 6 +++---
 sys/dev/pci/hptide.c        | 6 +++---
 sys/dev/pci/iteide.c        | 6 +++---
 sys/dev/pci/nside.c         | 6 +++---
 sys/dev/pci/optiide.c       | 6 +++---
 sys/dev/pci/pdcide.c        | 6 +++---
 sys/dev/pci/pdcsata.c       | 6 +++---
 sys/dev/pci/rccide.c        | 6 +++---
 sys/dev/pci/satalink.c      | 6 +++---
 sys/dev/pci/schide.c        | 6 +++---
 sys/dev/pci/siside.c        | 6 +++---
 sys/dev/pci/slide.c         | 6 +++---
 sys/dev/pci/stpcide.c       | 6 +++---
 sys/dev/pci/svwsata.c       | 6 +++---
 sys/dev/pci/toshide.c       | 6 +++---
 20 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/sys/arch/i386/pci/gcscide.c b/sys/arch/i386/pci/gcscide.c
index 23dc5d4d6815..bcaa42de4dc2 100644
--- a/sys/arch/i386/pci/gcscide.c
+++ b/sys/arch/i386/pci/gcscide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: gcscide.c,v 1.14 2012/07/31 15:50:32 bouyer Exp $	*/
+/*	$NetBSD: gcscide.c,v 1.15 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2007 Juan Romero Pardines.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscide.c,v 1.14 2012/07/31 15:50:32 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscide.c,v 1.15 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -112,7 +112,7 @@ static const uint32_t gcscide_udma_timings[] = {
 };
 
 CFATTACH_DECL_NEW(gcscide, sizeof(struct pciide_softc),
-    gcscide_match, gcscide_attach, NULL, NULL);
+    gcscide_match, gcscide_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_gcscide_products[] = {
 	{
diff --git a/sys/dev/pci/acardide.c b/sys/dev/pci/acardide.c
index 65f75db2e921..ab8ead00adcd 100644
--- a/sys/dev/pci/acardide.c
+++ b/sys/dev/pci/acardide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: acardide.c,v 1.30 2012/07/31 15:50:35 bouyer Exp $	*/
+/*	$NetBSD: acardide.c,v 1.31 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2001 Izumi Tsutsui.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acardide.c,v 1.30 2012/07/31 15:50:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acardide.c,v 1.31 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +46,7 @@ static int  acardide_match(device_t, cfdata_t, void *);
 static void acardide_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(acardide, sizeof(struct pciide_softc),
-    acardide_match, acardide_attach, NULL, NULL);
+    acardide_match, acardide_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_acard_products[] =  {
 	{ PCI_PRODUCT_ACARD_ATP850U,
diff --git a/sys/dev/pci/aceride.c b/sys/dev/pci/aceride.c
index 425a73922391..f4123e0816cb 100644
--- a/sys/dev/pci/aceride.c
+++ b/sys/dev/pci/aceride.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aceride.c,v 1.35 2012/07/31 15:50:35 bouyer Exp $	*/
+/*	$NetBSD: aceride.c,v 1.36 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.35 2012/07/31 15:50:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aceride.c,v 1.36 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,7 +52,7 @@ struct aceride_softc {
 };
 
 CFATTACH_DECL_NEW(aceride, sizeof(struct aceride_softc),
-    aceride_match, aceride_attach, NULL, NULL);
+    aceride_match, aceride_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_acer_products[] =  {
 	{ PCI_PRODUCT_ALI_M5229,
diff --git a/sys/dev/pci/artsata.c b/sys/dev/pci/artsata.c
index 2fcbd6ab1a51..e026d2d305d7 100644
--- a/sys/dev/pci/artsata.c
+++ b/sys/dev/pci/artsata.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: artsata.c,v 1.24 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: artsata.c,v 1.25 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: artsata.c,v 1.24 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: artsata.c,v 1.25 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include "opt_pciide.h"
 
@@ -91,7 +91,7 @@ static const struct artisea_cmd_map artisea_dpa_cmd_map[] =
 #define ARTISEA_NUM_CHAN 4
 
 CFATTACH_DECL_NEW(artsata, sizeof(struct pciide_softc),
-    artsata_match, artsata_attach, NULL, NULL);
+    artsata_match, artsata_attach, pciide_detach, NULL);
 
 static int
 artsata_match(device_t parent, cfdata_t match, void *aux)
diff --git a/sys/dev/pci/cypide.c b/sys/dev/pci/cypide.c
index 4c551ff33af0..4ed505ea1526 100644
--- a/sys/dev/pci/cypide.c
+++ b/sys/dev/pci/cypide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cypide.c,v 1.29 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: cypide.c,v 1.30 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cypide.c,v 1.29 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cypide.c,v 1.30 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +46,7 @@ static int  cypide_match(device_t, cfdata_t, void *);
 static void cypide_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(cypide, sizeof(struct pciide_softc),
-    cypide_match, cypide_attach, NULL, NULL);
+    cypide_match, cypide_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_cypress_products[] =  {
 	{ PCI_PRODUCT_CONTAQ_82C693,
diff --git a/sys/dev/pci/geodeide.c b/sys/dev/pci/geodeide.c
index 9714d2b8b1f6..ba1c337d9acb 100644
--- a/sys/dev/pci/geodeide.c
+++ b/sys/dev/pci/geodeide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: geodeide.c,v 1.24 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: geodeide.c,v 1.25 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 2004 Manuel Bouyer.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: geodeide.c,v 1.24 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: geodeide.c,v 1.25 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -53,7 +53,7 @@ static int  geodeide_match(device_t, cfdata_t, void *);
 static void geodeide_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(geodeide, sizeof(struct pciide_softc),
-    geodeide_match, geodeide_attach, NULL, NULL);
+    geodeide_match, geodeide_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_geode_products[] = {
 	{ PCI_PRODUCT_CYRIX_CX5530_IDE,
diff --git a/sys/dev/pci/hptide.c b/sys/dev/pci/hptide.c
index 11d374f93485..d7b1ecb89286 100644
--- a/sys/dev/pci/hptide.c
+++ b/sys/dev/pci/hptide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: hptide.c,v 1.33 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: hptide.c,v 1.34 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hptide.c,v 1.33 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hptide.c,v 1.34 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,7 +44,7 @@ static int  hptide_match(device_t, cfdata_t, void *);
 static void hptide_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(hptide, sizeof(struct pciide_softc),
-    hptide_match, hptide_attach, NULL, NULL);
+    hptide_match, hptide_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_triones_products[] =  {
 	{ PCI_PRODUCT_TRIONES_HPT302,
diff --git a/sys/dev/pci/iteide.c b/sys/dev/pci/iteide.c
index 43bbe41554b6..ab58a98395db 100644
--- a/sys/dev/pci/iteide.c
+++ b/sys/dev/pci/iteide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iteide.c,v 1.18 2012/10/27 17:18:34 chs Exp $	*/
+/*	$NetBSD: iteide.c,v 1.19 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iteide.c,v 1.18 2012/10/27 17:18:34 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iteide.c,v 1.19 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,7 +49,7 @@ static int  iteide_match(device_t, cfdata_t, void *);
 static void iteide_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(iteide, sizeof(struct pciide_softc),
-    iteide_match, iteide_attach, NULL, NULL);
+    iteide_match, iteide_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_ite_products[] =  {
 	{ PCI_PRODUCT_ITE_IT8211,
diff --git a/sys/dev/pci/nside.c b/sys/dev/pci/nside.c
index 0cede6cba22c..a6100029e093 100644
--- a/sys/dev/pci/nside.c
+++ b/sys/dev/pci/nside.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nside.c,v 1.8 2013/10/07 19:37:24 jakllsch Exp $	*/
+/*	$NetBSD: nside.c,v 1.9 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nside.c,v 1.8 2013/10/07 19:37:24 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nside.c,v 1.9 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +46,7 @@ static int  nside_match(device_t, cfdata_t, void *);
 static void nside_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(nside, sizeof(struct pciide_softc),
-    nside_match, nside_attach, NULL, NULL);
+    nside_match, nside_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_natsemi_products[] =  {
 	{ PCI_PRODUCT_NS_PC87415,       /* National Semi PC87415 IDE */
diff --git a/sys/dev/pci/optiide.c b/sys/dev/pci/optiide.c
index d1a3249c05d2..e41c45678ee3 100644
--- a/sys/dev/pci/optiide.c
+++ b/sys/dev/pci/optiide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: optiide.c,v 1.24 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: optiide.c,v 1.25 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: optiide.c,v 1.24 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: optiide.c,v 1.25 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,7 +48,7 @@ static int  optiide_match(device_t, cfdata_t, void *);
 static void optiide_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(optiide, sizeof(struct pciide_softc),
-    optiide_match, optiide_attach, NULL, NULL);
+    optiide_match, optiide_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_opti_products[] =  {
 	{ PCI_PRODUCT_OPTI_82C621,
diff --git a/sys/dev/pci/pdcide.c b/sys/dev/pci/pdcide.c
index 43ee0a0192db..4b291863833c 100644
--- a/sys/dev/pci/pdcide.c
+++ b/sys/dev/pci/pdcide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pdcide.c,v 1.34 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: pdcide.c,v 1.35 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdcide.c,v 1.34 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdcide.c,v 1.35 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,7 +49,7 @@ static int  pdcide_match(device_t, cfdata_t, void *);
 static void pdcide_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(pdcide, sizeof(struct pciide_softc),
-    pdcide_match, pdcide_attach, NULL, NULL);
+    pdcide_match, pdcide_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_promise_products[] =  {
 	{ PCI_PRODUCT_PROMISE_PDC20246,
diff --git a/sys/dev/pci/pdcsata.c b/sys/dev/pci/pdcsata.c
index 6a014e73457d..ac1527d60ab7 100644
--- a/sys/dev/pci/pdcsata.c
+++ b/sys/dev/pci/pdcsata.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pdcsata.c,v 1.25 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: pdcsata.c,v 1.26 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 2004, Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.25 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.26 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -71,7 +71,7 @@ static int  pdcsata_match(device_t, cfdata_t, void *);
 static void pdcsata_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(pdcsata, sizeof(struct pciide_softc),
-    pdcsata_match, pdcsata_attach, NULL, NULL);
+    pdcsata_match, pdcsata_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_pdcsata_products[] =  {
 	{ PCI_PRODUCT_PROMISE_PDC20318,
diff --git a/sys/dev/pci/rccide.c b/sys/dev/pci/rccide.c
index a269c887d5a0..45ded55c27a3 100644
--- a/sys/dev/pci/rccide.c
+++ b/sys/dev/pci/rccide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: rccide.c,v 1.26 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: rccide.c,v 1.27 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 2003 By Noon Software, Inc.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rccide.c,v 1.26 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rccide.c,v 1.27 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,7 +47,7 @@ static int  rccide_match(device_t, cfdata_t, void *);
 static void rccide_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(rccide, sizeof(struct pciide_softc),
-    rccide_match, rccide_attach, NULL, NULL);
+    rccide_match, rccide_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_serverworks_products[] =  {
 	{ PCI_PRODUCT_SERVERWORKS_OSB4_IDE,
diff --git a/sys/dev/pci/satalink.c b/sys/dev/pci/satalink.c
index ea68dc0b4701..edc694b6d621 100644
--- a/sys/dev/pci/satalink.c
+++ b/sys/dev/pci/satalink.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: satalink.c,v 1.50 2013/09/15 13:49:25 martin Exp $	*/
+/*	$NetBSD: satalink.c,v 1.51 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.50 2013/09/15 13:49:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.51 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -260,7 +260,7 @@ static int  satalink_match(device_t, cfdata_t, void *);
 static void satalink_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(satalink, sizeof(struct pciide_softc),
-    satalink_match, satalink_attach, NULL, NULL);
+    satalink_match, satalink_attach, pciide_detach, NULL);
 
 static void sii3112_chip_map(struct pciide_softc*,
     const struct pci_attach_args*);
diff --git a/sys/dev/pci/schide.c b/sys/dev/pci/schide.c
index 688beb40a471..228d8609909e 100644
--- a/sys/dev/pci/schide.c
+++ b/sys/dev/pci/schide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: schide.c,v 1.7 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: schide.c,v 1.8 2013/10/07 19:51:55 jakllsch Exp $	*/
 /*	$OpenBSD: pciide.c,v 1.305 2009/11/01 01:50:15 dlg Exp $	*/
 
 /*
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: schide.c,v 1.7 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: schide.c,v 1.8 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -74,7 +74,7 @@ static int  schide_match(device_t, cfdata_t, void *);
 static void schide_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(schide, sizeof(struct pciide_softc),
-    schide_match, schide_attach, NULL, NULL);
+    schide_match, schide_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_sch_products[] =  {
 	{ PCI_PRODUCT_INTEL_SCH_IDE,
diff --git a/sys/dev/pci/siside.c b/sys/dev/pci/siside.c
index 695209c5e04c..4d91b9787aad 100644
--- a/sys/dev/pci/siside.c
+++ b/sys/dev/pci/siside.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: siside.c,v 1.33 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: siside.c,v 1.34 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siside.c,v 1.33 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siside.c,v 1.34 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,7 +49,7 @@ static int  siside_match(device_t, cfdata_t, void *);
 static void siside_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(siside, sizeof(struct pciide_softc),
-    siside_match, siside_attach, NULL, NULL);
+    siside_match, siside_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_sis_products[] =  {
 	{ PCI_PRODUCT_SIS_5597_IDE,
diff --git a/sys/dev/pci/slide.c b/sys/dev/pci/slide.c
index 29ea3882c192..655e5392fc11 100644
--- a/sys/dev/pci/slide.c
+++ b/sys/dev/pci/slide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: slide.c,v 1.28 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: slide.c,v 1.29 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: slide.c,v 1.28 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slide.c,v 1.29 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -49,7 +49,7 @@ static int  slide_match(device_t, cfdata_t, void *);
 static void slide_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(slide, sizeof(struct pciide_softc),
-    slide_match, slide_attach, NULL, NULL);
+    slide_match, slide_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_symphony_products[] = {
 	{ PCI_PRODUCT_SYMPHONY_82C105,
diff --git a/sys/dev/pci/stpcide.c b/sys/dev/pci/stpcide.c
index 56d72130f818..c83a053b67c8 100644
--- a/sys/dev/pci/stpcide.c
+++ b/sys/dev/pci/stpcide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: stpcide.c,v 1.26 2012/07/31 15:50:36 bouyer Exp $	*/
+/*	$NetBSD: stpcide.c,v 1.27 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stpcide.c,v 1.26 2012/07/31 15:50:36 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stpcide.c,v 1.27 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -57,7 +57,7 @@ const struct pciide_product_desc pciide_stpc_products[] = {
 };
 
 CFATTACH_DECL_NEW(stpcide, sizeof(struct pciide_softc),
-    stpcide_match, stpcide_attach, NULL, NULL);
+    stpcide_match, stpcide_attach, pciide_detach, NULL);
 
 static int
 stpcide_match(device_t parent, cfdata_t match, void *aux)
diff --git a/sys/dev/pci/svwsata.c b/sys/dev/pci/svwsata.c
index 131cf1708ef0..93b71a9a78ef 100644
--- a/sys/dev/pci/svwsata.c
+++ b/sys/dev/pci/svwsata.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svwsata.c,v 1.17 2013/04/28 00:47:56 macallan Exp $	*/
+/*	$NetBSD: svwsata.c,v 1.18 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -17,7 +17,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.17 2013/04/28 00:47:56 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.18 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,7 +41,7 @@ static void svwsata_mapreg_dma(struct pciide_softc *,
 static void svwsata_mapchan(struct pciide_channel *);
 
 CFATTACH_DECL_NEW(svwsata, sizeof(struct pciide_softc),
-    svwsata_match, svwsata_attach, NULL, NULL);
+    svwsata_match, svwsata_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_svwsata_products[] =  {
 	{ PCI_PRODUCT_SERVERWORKS_K2_SATA,
diff --git a/sys/dev/pci/toshide.c b/sys/dev/pci/toshide.c
index 100f45748107..bc1bc1e87a5f 100644
--- a/sys/dev/pci/toshide.c
+++ b/sys/dev/pci/toshide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: toshide.c,v 1.9 2012/07/31 15:50:37 bouyer Exp $	*/
+/*	$NetBSD: toshide.c,v 1.10 2013/10/07 19:51:55 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: toshide.c,v 1.9 2012/07/31 15:50:37 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toshide.c,v 1.10 2013/10/07 19:51:55 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -46,7 +46,7 @@ static int  piccolo_match(device_t, cfdata_t, void *);
 static void piccolo_attach(device_t, device_t, void *);
 
 CFATTACH_DECL_NEW(toshide, sizeof(struct pciide_softc),
-    piccolo_match, piccolo_attach, NULL, NULL);
+    piccolo_match, piccolo_attach, pciide_detach, NULL);
 
 static const struct pciide_product_desc pciide_toshiba2_products[] = {
 	{