Module Name: src
Committed By: jakllsch
Date: Mon Oct 7 19:51:55 UTC 2013
Modified Files:
src/sys/arch/i386/pci: gcscide.c
src/sys/dev/pci: acardide.c aceride.c artsata.c cypide.c geodeide.c
hptide.c iteide.c nside.c optiide.c pdcide.c pdcsata.c rccide.c
satalink.c schide.c siside.c slide.c stpcide.c svwsata.c toshide.c
Log Message:
Use the universal pciide_detach() for detach function of all remaining
pciide-core drivers, except pciide at pnpbios which isn't actually PCI.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/i386/pci/gcscide.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/acardide.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/aceride.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/artsata.c \
src/sys/dev/pci/geodeide.c src/sys/dev/pci/optiide.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/cypide.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/hptide.c src/sys/dev/pci/siside.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/iteide.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/nside.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/pdcide.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/pdcsata.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/rccide.c src/sys/dev/pci/stpcide.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/satalink.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/schide.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/slide.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/svwsata.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/toshide.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/pci/gcscide.c
diff -u src/sys/arch/i386/pci/gcscide.c:1.14 src/sys/arch/i386/pci/gcscide.c:1.15
--- src/sys/arch/i386/pci/gcscide.c:1.14 Tue Jul 31 15:50:32 2012
+++ src/sys/arch/i386/pci/gcscide.c Mon Oct 7 19:51:55 2013
@@ -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_timin
};
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[] = {
{
Index: src/sys/dev/pci/acardide.c
diff -u src/sys/dev/pci/acardide.c:1.30 src/sys/dev/pci/acardide.c:1.31
--- src/sys/dev/pci/acardide.c:1.30 Tue Jul 31 15:50:35 2012
+++ src/sys/dev/pci/acardide.c Mon Oct 7 19:51:55 2013
@@ -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, cfd
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,
Index: src/sys/dev/pci/aceride.c
diff -u src/sys/dev/pci/aceride.c:1.35 src/sys/dev/pci/aceride.c:1.36
--- src/sys/dev/pci/aceride.c:1.35 Tue Jul 31 15:50:35 2012
+++ src/sys/dev/pci/aceride.c Mon Oct 7 19:51:55 2013
@@ -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,
Index: src/sys/dev/pci/artsata.c
diff -u src/sys/dev/pci/artsata.c:1.24 src/sys/dev/pci/artsata.c:1.25
--- src/sys/dev/pci/artsata.c:1.24 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/artsata.c Mon Oct 7 19:51:55 2013
@@ -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 arti
#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)
Index: src/sys/dev/pci/geodeide.c
diff -u src/sys/dev/pci/geodeide.c:1.24 src/sys/dev/pci/geodeide.c:1.25
--- src/sys/dev/pci/geodeide.c:1.24 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/geodeide.c Mon Oct 7 19:51:55 2013
@@ -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, cfd
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,
Index: src/sys/dev/pci/optiide.c
diff -u src/sys/dev/pci/optiide.c:1.24 src/sys/dev/pci/optiide.c:1.25
--- src/sys/dev/pci/optiide.c:1.24 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/optiide.c Mon Oct 7 19:51:55 2013
@@ -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, cfda
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,
Index: src/sys/dev/pci/cypide.c
diff -u src/sys/dev/pci/cypide.c:1.29 src/sys/dev/pci/cypide.c:1.30
--- src/sys/dev/pci/cypide.c:1.29 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/cypide.c Mon Oct 7 19:51:55 2013
@@ -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, cfdat
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,
Index: src/sys/dev/pci/hptide.c
diff -u src/sys/dev/pci/hptide.c:1.33 src/sys/dev/pci/hptide.c:1.34
--- src/sys/dev/pci/hptide.c:1.33 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/hptide.c Mon Oct 7 19:51:55 2013
@@ -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, cfdat
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,
Index: src/sys/dev/pci/siside.c
diff -u src/sys/dev/pci/siside.c:1.33 src/sys/dev/pci/siside.c:1.34
--- src/sys/dev/pci/siside.c:1.33 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/siside.c Mon Oct 7 19:51:55 2013
@@ -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, cfdat
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,
Index: src/sys/dev/pci/iteide.c
diff -u src/sys/dev/pci/iteide.c:1.18 src/sys/dev/pci/iteide.c:1.19
--- src/sys/dev/pci/iteide.c:1.18 Sat Oct 27 17:18:34 2012
+++ src/sys/dev/pci/iteide.c Mon Oct 7 19:51:55 2013
@@ -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, cfdat
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,
Index: src/sys/dev/pci/nside.c
diff -u src/sys/dev/pci/nside.c:1.8 src/sys/dev/pci/nside.c:1.9
--- src/sys/dev/pci/nside.c:1.8 Mon Oct 7 19:37:24 2013
+++ src/sys/dev/pci/nside.c Mon Oct 7 19:51:55 2013
@@ -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
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 */
Index: src/sys/dev/pci/pdcide.c
diff -u src/sys/dev/pci/pdcide.c:1.34 src/sys/dev/pci/pdcide.c:1.35
--- src/sys/dev/pci/pdcide.c:1.34 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/pdcide.c Mon Oct 7 19:51:55 2013
@@ -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, cfdat
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,
Index: src/sys/dev/pci/pdcsata.c
diff -u src/sys/dev/pci/pdcsata.c:1.25 src/sys/dev/pci/pdcsata.c:1.26
--- src/sys/dev/pci/pdcsata.c:1.25 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/pdcsata.c Mon Oct 7 19:51:55 2013
@@ -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, cfda
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,
Index: src/sys/dev/pci/rccide.c
diff -u src/sys/dev/pci/rccide.c:1.26 src/sys/dev/pci/rccide.c:1.27
--- src/sys/dev/pci/rccide.c:1.26 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/rccide.c Mon Oct 7 19:51:55 2013
@@ -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, cfdat
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,
Index: src/sys/dev/pci/stpcide.c
diff -u src/sys/dev/pci/stpcide.c:1.26 src/sys/dev/pci/stpcide.c:1.27
--- src/sys/dev/pci/stpcide.c:1.26 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/stpcide.c Mon Oct 7 19:51:55 2013
@@ -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_
};
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)
Index: src/sys/dev/pci/satalink.c
diff -u src/sys/dev/pci/satalink.c:1.50 src/sys/dev/pci/satalink.c:1.51
--- src/sys/dev/pci/satalink.c:1.50 Sun Sep 15 13:49:25 2013
+++ src/sys/dev/pci/satalink.c Mon Oct 7 19:51:55 2013
@@ -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, cfd
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*);
Index: src/sys/dev/pci/schide.c
diff -u src/sys/dev/pci/schide.c:1.7 src/sys/dev/pci/schide.c:1.8
--- src/sys/dev/pci/schide.c:1.7 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/schide.c Mon Oct 7 19:51:55 2013
@@ -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, cfdat
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,
Index: src/sys/dev/pci/slide.c
diff -u src/sys/dev/pci/slide.c:1.28 src/sys/dev/pci/slide.c:1.29
--- src/sys/dev/pci/slide.c:1.28 Tue Jul 31 15:50:36 2012
+++ src/sys/dev/pci/slide.c Mon Oct 7 19:51:55 2013
@@ -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
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,
Index: src/sys/dev/pci/svwsata.c
diff -u src/sys/dev/pci/svwsata.c:1.17 src/sys/dev/pci/svwsata.c:1.18
--- src/sys/dev/pci/svwsata.c:1.17 Sun Apr 28 00:47:56 2013
+++ src/sys/dev/pci/svwsata.c Mon Oct 7 19:51:55 2013
@@ -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 pc
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,
Index: src/sys/dev/pci/toshide.c
diff -u src/sys/dev/pci/toshide.c:1.9 src/sys/dev/pci/toshide.c:1.10
--- src/sys/dev/pci/toshide.c:1.9 Tue Jul 31 15:50:37 2012
+++ src/sys/dev/pci/toshide.c Mon Oct 7 19:51:55 2013
@@ -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, cfda
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[] = {
{
