[src/trunk]: src/sys/dev Remove superfluous activation hook.

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

details:   https://anonhg.NetBSD.org/src/rev/0eab4fc10b7e
branches:  trunk
changeset: 748989:0eab4fc10b7e
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Thu Nov 12 19:37:17 2009 +0000

description:
Remove superfluous activation hook.

diffstat:

 sys/dev/ic/wdc.c            |  32 ++------------------------------
 sys/dev/pcmcia/wdc_pcmcia.c |   6 +++---
 2 files changed, 5 insertions(+), 33 deletions(-)

diffs (80 lines):

diff -r 1bd2b755ddeb -r 0eab4fc10b7e sys/dev/ic/wdc.c
--- a/sys/dev/ic/wdc.c  Thu Nov 12 19:35:59 2009 +0000
+++ b/sys/dev/ic/wdc.c  Thu Nov 12 19:37:17 2009 +0000
@@ -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)
 {
diff -r 1bd2b755ddeb -r 0eab4fc10b7e sys/dev/pcmcia/wdc_pcmcia.c
--- a/sys/dev/pcmcia/wdc_pcmcia.c       Thu Nov 12 19:35:59 2009 +0000
+++ b/sys/dev/pcmcia/wdc_pcmcia.c       Thu Nov 12 19:37:17 2009 +0000
@@ -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;