[src/trunk]: src/sys Use the universal pciide_detach() for detach function of...

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b3b7b9893304
branches:  trunk
changeset: 790424:b3b7b9893304
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Mon Oct 07 19:51:55 2013 +0000

description:
Use the universal pciide_detach() for detach function of all remaining
pciide-core drivers, except pciide at pnpbios which isn't actually PCI.

diffstat:

 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(-)

diffs (truncated from 540 to 300 lines):

diff -r e363f7631344 -r b3b7b9893304 sys/arch/i386/pci/gcscide.c
--- a/sys/arch/i386/pci/gcscide.c       Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/arch/i386/pci/gcscide.c       Mon Oct 07 19:51:55 2013 +0000
@@ -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 @@
 };
 
 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 -r e363f7631344 -r b3b7b9893304 sys/dev/pci/acardide.c
--- a/sys/dev/pci/acardide.c    Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/dev/pci/acardide.c    Mon Oct 07 19:51:55 2013 +0000
@@ -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 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 -r e363f7631344 -r b3b7b9893304 sys/dev/pci/aceride.c
--- a/sys/dev/pci/aceride.c     Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/dev/pci/aceride.c     Mon Oct 07 19:51:55 2013 +0000
@@ -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 @@
 };
 
 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 -r e363f7631344 -r b3b7b9893304 sys/dev/pci/artsata.c
--- a/sys/dev/pci/artsata.c     Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/dev/pci/artsata.c     Mon Oct 07 19:51:55 2013 +0000
@@ -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 @@
 #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 -r e363f7631344 -r b3b7b9893304 sys/dev/pci/cypide.c
--- a/sys/dev/pci/cypide.c      Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/dev/pci/cypide.c      Mon Oct 07 19:51:55 2013 +0000
@@ -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 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 -r e363f7631344 -r b3b7b9893304 sys/dev/pci/geodeide.c
--- a/sys/dev/pci/geodeide.c    Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/dev/pci/geodeide.c    Mon Oct 07 19:51:55 2013 +0000
@@ -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 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 -r e363f7631344 -r b3b7b9893304 sys/dev/pci/hptide.c
--- a/sys/dev/pci/hptide.c      Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/dev/pci/hptide.c      Mon Oct 07 19:51:55 2013 +0000
@@ -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 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 -r e363f7631344 -r b3b7b9893304 sys/dev/pci/iteide.c
--- a/sys/dev/pci/iteide.c      Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/dev/pci/iteide.c      Mon Oct 07 19:51:55 2013 +0000
@@ -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 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 -r e363f7631344 -r b3b7b9893304 sys/dev/pci/nside.c
--- a/sys/dev/pci/nside.c       Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/dev/pci/nside.c       Mon Oct 07 19:51:55 2013 +0000
@@ -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 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 -r e363f7631344 -r b3b7b9893304 sys/dev/pci/optiide.c
--- a/sys/dev/pci/optiide.c     Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/dev/pci/optiide.c     Mon Oct 07 19:51:55 2013 +0000
@@ -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 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 -r e363f7631344 -r b3b7b9893304 sys/dev/pci/pdcide.c
--- a/sys/dev/pci/pdcide.c      Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/dev/pci/pdcide.c      Mon Oct 07 19:51:55 2013 +0000
@@ -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 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 -r e363f7631344 -r b3b7b9893304 sys/dev/pci/pdcsata.c
--- a/sys/dev/pci/pdcsata.c     Mon Oct 07 19:37:24 2013 +0000
+++ b/sys/dev/pci/pdcsata.c     Mon Oct 07 19:51:55 2013 +0000