Module Name: src
Committed By: dyoung
Date: Thu Nov 12 19:37:17 UTC 2009
Modified Files:
src/sys/dev/ic: wdc.c
src/sys/dev/pcmcia: wdc_pcmcia.c
Log Message:
Remove superfluous activation hook.
To generate a diff of this commit:
cvs rdiff -u -r1.259 -r1.260 src/sys/dev/ic/wdc.c
cvs rdiff -u -r1.116 -r1.117 src/sys/dev/pcmcia/wdc_pcmcia.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/dev/ic/wdc.c
diff -u src/sys/dev/ic/wdc.c:1.259 src/sys/dev/ic/wdc.c:1.260
--- src/sys/dev/ic/wdc.c:1.259 Mon Oct 19 18:41:13 2009
+++ src/sys/dev/ic/wdc.c Thu Nov 12 19:37:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc.c,v 1.259 2009/10/19 18:41:13 bouyer Exp $ */
+/* $NetBSD: wdc.c,v 1.260 2009/11/12 19:37:17 dyoung Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.259 2009/10/19 18:41:13 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.260 2009/11/12 19:37:17 dyoung Exp $");
#include "opt_ata.h"
@@ -775,34 +775,6 @@
ata_channel_attach(chp);
}
-int
-wdcactivate(device_t self, enum devact act)
-{
- struct atac_softc *atac = device_private(self);
- struct ata_channel *chp;
- int s, i, error = 0;
-
- s = splbio();
- switch (act) {
- case DVACT_ACTIVATE:
- error = EOPNOTSUPP;
- break;
-
- case DVACT_DEACTIVATE:
- for (i = 0; i < atac->atac_nchannels; i++) {
- chp = atac->atac_channels[i];
- if (chp->atabus == NULL)
- continue;
- error = config_deactivate(chp->atabus);
- if (error)
- break;
- }
- break;
- }
- splx(s);
- return (error);
-}
-
void
wdc_childdetached(device_t self, device_t child)
{
Index: src/sys/dev/pcmcia/wdc_pcmcia.c
diff -u src/sys/dev/pcmcia/wdc_pcmcia.c:1.116 src/sys/dev/pcmcia/wdc_pcmcia.c:1.117
--- src/sys/dev/pcmcia/wdc_pcmcia.c:1.116 Tue May 12 14:42:19 2009
+++ src/sys/dev/pcmcia/wdc_pcmcia.c Thu Nov 12 19:37:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_pcmcia.c,v 1.116 2009/05/12 14:42:19 cegger Exp $ */
+/* $NetBSD: wdc_pcmcia.c,v 1.117 2009/11/12 19:37:17 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.116 2009/05/12 14:42:19 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_pcmcia.c,v 1.117 2009/11/12 19:37:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -89,7 +89,7 @@
static int wdc_pcmcia_detach(device_t, int);
CFATTACH_DECL_NEW(wdc_pcmcia, sizeof(struct wdc_pcmcia_softc),
- wdc_pcmcia_match, wdc_pcmcia_attach, wdc_pcmcia_detach, wdcactivate);
+ wdc_pcmcia_match, wdc_pcmcia_attach, wdc_pcmcia_detach, NULL);
static const struct wdc_pcmcia_product {
struct pcmcia_product wdc_product;
