[src/trunk]: src/sys/dev more proper fix to ex_disable.

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

details:   https://anonhg.NetBSD.org/src/rev/f416def7d050
branches:  trunk
changeset: 533090:f416def7d050
user:      itojun <itojun%NetBSD.org@localhost>
date:      Thu Jun 20 23:47:25 2002 +0000

description:
more proper fix to ex_disable.

diffstat:

 sys/dev/ic/elinkxl.c    |  6 ++----
 sys/dev/ic/elinkxlvar.h |  5 ++++-
 sys/dev/pci/if_ex_pci.c |  6 +++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diffs (70 lines):

diff -r 6a9faf7b7b0d -r f416def7d050 sys/dev/ic/elinkxl.c
--- a/sys/dev/ic/elinkxl.c      Thu Jun 20 23:38:47 2002 +0000
+++ b/sys/dev/ic/elinkxl.c      Thu Jun 20 23:47:25 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elinkxl.c,v 1.63 2002/05/12 15:48:38 wiz Exp $ */
+/*     $NetBSD: elinkxl.c,v 1.64 2002/06/20 23:47:25 itojun Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.63 2002/05/12 15:48:38 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.64 2002/06/20 23:47:25 itojun Exp $");
 
 #include "bpfilter.h"
 #include "rnd.h"
@@ -104,8 +104,6 @@
 void ex_printstats __P((struct ex_softc *));
 void ex_tick __P((void *));
 
-int ex_enable __P((struct ex_softc *));
-void ex_disable __P((struct ex_softc *));
 void ex_power __P((int, void *));
 
 static int ex_eeprom_busy __P((struct ex_softc *));
diff -r 6a9faf7b7b0d -r f416def7d050 sys/dev/ic/elinkxlvar.h
--- a/sys/dev/ic/elinkxlvar.h   Thu Jun 20 23:38:47 2002 +0000
+++ b/sys/dev/ic/elinkxlvar.h   Thu Jun 20 23:47:25 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: elinkxlvar.h,v 1.12 2001/12/28 20:35:47 christos Exp $ */
+/*     $NetBSD: elinkxlvar.h,v 1.13 2002/06/20 23:47:26 itojun Exp $   */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -154,3 +154,6 @@
 int    ex_ioctl __P((struct ifnet *ifp, u_long, caddr_t));
 int    ex_activate __P((struct device *, enum devact));
 int    ex_detach __P((struct ex_softc *));
+
+int    ex_enable __P((struct ex_softc *));
+void   ex_disable __P((struct ex_softc *));
diff -r 6a9faf7b7b0d -r f416def7d050 sys/dev/pci/if_ex_pci.c
--- a/sys/dev/pci/if_ex_pci.c   Thu Jun 20 23:38:47 2002 +0000
+++ b/sys/dev/pci/if_ex_pci.c   Thu Jun 20 23:47:25 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ex_pci.c,v 1.22 2002/06/20 23:38:47 itojun Exp $    */
+/*     $NetBSD: if_ex_pci.c,v 1.23 2002/06/20 23:47:26 itojun Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.22 2002/06/20 23:38:47 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.23 2002/06/20 23:47:26 itojun Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -328,7 +328,7 @@
                    PCI_INTRACK);
 
        if (sc->disable != NULL)
-               (*sc->disable)(sc);
+               ex_disable(sc);
 }
 
 void