[src/trunk]: src/sys/dev/pcmcia Don't use the superfluous activation hook.

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

details:   https://anonhg.NetBSD.org/src/rev/a8b9b7d1f5f6
branches:  trunk
changeset: 748983:a8b9b7d1f5f6
user:      dyoung <dyoung%NetBSD.org@localhost>
date:      Thu Nov 12 19:24:06 2009 +0000

description:
Don't use the superfluous activation hook.

Cosmetic: while I'm here, join two lines.

diffstat:

 sys/dev/pcmcia/aic_pcmcia.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r a2f66660c718 -r a8b9b7d1f5f6 sys/dev/pcmcia/aic_pcmcia.c
--- a/sys/dev/pcmcia/aic_pcmcia.c       Thu Nov 12 19:22:08 2009 +0000
+++ b/sys/dev/pcmcia/aic_pcmcia.c       Thu Nov 12 19:24:06 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aic_pcmcia.c,v 1.42 2009/09/22 13:20:36 tsutsui Exp $  */
+/*     $NetBSD: aic_pcmcia.c,v 1.43 2009/11/12 19:24:06 dyoung Exp $   */
 
 /*
  * Copyright (c) 1997 Marc Horowitz.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.42 2009/09/22 13:20:36 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic_pcmcia.c,v 1.43 2009/11/12 19:24:06 dyoung Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -69,7 +69,7 @@
 static int     aic_pcmcia_enable(device_t, int);
 
 CFATTACH_DECL_NEW(aic_pcmcia, sizeof(struct aic_pcmcia_softc),
-    aic_pcmcia_match, aic_pcmcia_attach, aic_pcmcia_detach, aic_activate);
+    aic_pcmcia_match, aic_pcmcia_attach, aic_pcmcia_detach, NULL);
 
 static const struct pcmcia_product aic_pcmcia_products[] = {
        { PCMCIA_VENDOR_ADAPTEC, PCMCIA_PRODUCT_ADAPTEC_APA1460,
@@ -119,8 +119,7 @@
 
        error = pcmcia_function_configure(pf, aic_pcmcia_validate_config);
        if (error) {
-               aprint_error_dev(self, "configure failed, error=%d\n",
-                   error);
+               aprint_error_dev(self, "configure failed, error=%d\n", error);
                return;
        }