summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-09 12:22:54 +0000
committerMarc Balmer <mbalmer@cvs.openbsd.org>2007-06-09 12:22:54 +0000
commit58fb33858fc35a04554f8b7122b958bdca98ffd6 (patch)
tree9ca8459e9563990354f6e383e9cbc0eed97fc13a /sys/dev
parent8b60e5b9aea497048410a9aabf02ce656d6810ed (diff)
Remove the definition and use of if_deactivate(). It was defined empty and
thus produced no code at all. No binary change. ok jsg.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/if_atu.c6
-rw-r--r--sys/dev/usb/if_aue.c3
-rw-r--r--sys/dev/usb/if_axe.c3
-rw-r--r--sys/dev/usb/if_cdce.c3
-rw-r--r--sys/dev/usb/if_cue.c4
-rw-r--r--sys/dev/usb/if_ral.c3
-rw-r--r--sys/dev/usb/if_rum.c3
-rw-r--r--sys/dev/usb/if_uath.c3
-rw-r--r--sys/dev/usb/if_udav.c3
-rw-r--r--sys/dev/usb/if_upl.c4
-rw-r--r--sys/dev/usb/if_url.c3
-rw-r--r--sys/dev/usb/if_wi_usb.c3
-rw-r--r--sys/dev/usb/if_zyd.c3
-rw-r--r--sys/dev/usb/ueagle.c3
-rw-r--r--sys/dev/usb/usb_port.h3
15 files changed, 16 insertions, 34 deletions
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index 857e27189e6..3a13774923f 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_atu.c,v 1.81 2007/05/27 04:00:24 jsg Exp $ */
+/* $OpenBSD: if_atu.c,v 1.82 2007/06/09 12:22:53 mbalmer Exp $ */
/*
* Copyright (c) 2003, 2004
* Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved.
@@ -1511,10 +1511,8 @@ atu_activate(device_ptr_t self, enum devact act)
case DVACT_ACTIVATE:
break;
case DVACT_DEACTIVATE:
- if (sc->sc_state != ATU_S_UNCONFIG) {
- if_deactivate(&sc->atu_ec.ec_if);
+ if (sc->sc_state != ATU_S_UNCONFIG)
sc->sc_state = ATU_S_DEAD;
- }
break;
}
return (0);
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 3a3716ec35c..8fe06977cea 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_aue.c,v 1.57 2007/06/05 08:43:55 mbalmer Exp $ */
+/* $OpenBSD: if_aue.c,v 1.58 2007/06/09 12:22:53 mbalmer Exp $ */
/* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -898,7 +898,6 @@ aue_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- if_deactivate(&sc->aue_ec.ec_if);
sc->aue_dying = 1;
break;
}
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 4ad7503c551..8a877c9b2bd 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_axe.c,v 1.70 2007/06/05 08:43:55 mbalmer Exp $ */
+/* $OpenBSD: if_axe.c,v 1.71 2007/06/09 12:22:53 mbalmer Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Jonathan Gray <jsg@openbsd.org>
@@ -805,7 +805,6 @@ axe_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- if_deactivate(&sc->axe_ec.ec_if);
sc->axe_dying = 1;
break;
}
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index 68fac6d0de1..cd660a9e3a0 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cdce.c,v 1.27 2007/06/05 08:43:55 mbalmer Exp $ */
+/* $OpenBSD: if_cdce.c,v 1.28 2007/06/09 12:22:53 mbalmer Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -789,7 +789,6 @@ cdce_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- if_deactivate(GET_IFP(sc));
sc->cdce_dying = 1;
break;
}
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 200e513ee0d..3203c858d2d 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cue.c,v 1.37 2007/06/05 08:43:55 mbalmer Exp $ */
+/* $OpenBSD: if_cue.c,v 1.38 2007/06/09 12:22:53 mbalmer Exp $ */
/* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -597,8 +597,6 @@ cue_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- /* Deactivate the interface. */
- if_deactivate(&sc->cue_ec.ec_if);
sc->cue_dying = 1;
break;
}
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index c47d2b81bf2..83965781340 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ral.c,v 1.94 2007/06/09 08:52:10 damien Exp $ */
+/* $OpenBSD: if_ral.c,v 1.95 2007/06/09 12:22:53 mbalmer Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -2183,7 +2183,6 @@ ural_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- /*if_deactivate(&sc->sc_ic.ic_if);*/
break;
}
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index bc3a72c8bee..5ad6cbe6e7d 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_rum.c,v 1.59 2007/06/09 08:52:10 damien Exp $ */
+/* $OpenBSD: if_rum.c,v 1.60 2007/06/09 12:22:53 mbalmer Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -2249,7 +2249,6 @@ rum_activate(device_ptr_t self, enum devact act)
return EOPNOTSUPP;
case DVACT_DEACTIVATE:
- /*if_deactivate(&sc->sc_ic.ic_if);*/
break;
}
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index 3304c5f8e5a..12424fdda0d 100644
--- a/sys/dev/usb/if_uath.c
+++ b/sys/dev/usb/if_uath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_uath.c,v 1.21 2007/06/09 08:52:10 damien Exp $ */
+/* $OpenBSD: if_uath.c,v 1.22 2007/06/09 12:22:53 mbalmer Exp $ */
/*-
* Copyright (c) 2006
@@ -2122,7 +2122,6 @@ uath_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- /*if_deactivate(&sc->sc_ic.ic_if);*/
break;
}
return 0;
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index c502fc47700..038bc3f20a0 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_udav.c,v 1.26 2007/06/05 08:43:55 mbalmer Exp $ */
+/* $OpenBSD: if_udav.c,v 1.27 2007/06/09 12:22:53 mbalmer Exp $ */
/* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -721,7 +721,6 @@ udav_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- if_deactivate(&sc->sc_ec.ec_if);
sc->sc_dying = 1;
break;
}
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 8dbdb9b4ed8..99f1803156f 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_upl.c,v 1.31 2007/06/06 19:25:49 mk Exp $ */
+/* $OpenBSD: if_upl.c,v 1.32 2007/06/09 12:22:53 mbalmer Exp $ */
/* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -365,8 +365,6 @@ upl_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- /* Deactivate the interface. */
- if_deactivate(&sc->sc_if);
sc->sc_dying = 1;
break;
}
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index 941bb960535..f3120d84b81 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_url.c,v 1.40 2007/06/05 08:43:55 mbalmer Exp $ */
+/* $OpenBSD: if_url.c,v 1.41 2007/06/09 12:22:53 mbalmer Exp $ */
/* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -603,7 +603,6 @@ url_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- if_deactivate(GET_IFP(sc));
sc->sc_dying = 1;
break;
}
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 62d8aad68cc..813e6e1f352 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_usb.c,v 1.36 2007/05/27 04:00:25 jsg Exp $ */
+/* $OpenBSD: if_wi_usb.c,v 1.37 2007/06/09 12:22:53 mbalmer Exp $ */
/*
* Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -1341,7 +1341,6 @@ wi_usb_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- if_deactivate(&sc->sc_wi.wi_ec.ec_if);
sc->wi_usb_dying = 1;
sc->wi_thread_info->dying = 1;
break;
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index fe9d03c3117..bbb177ba999 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_zyd.c,v 1.53 2007/05/27 04:00:25 jsg Exp $ */
+/* $OpenBSD: if_zyd.c,v 1.54 2007/06/09 12:22:53 mbalmer Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -2533,7 +2533,6 @@ zyd_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- /*if_deactivate(&sc->sc_ic.sc_if);*/
break;
}
return 0;
diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c
index e7eb097c896..107f108519f 100644
--- a/sys/dev/usb/ueagle.c
+++ b/sys/dev/usb/ueagle.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ueagle.c,v 1.16 2007/06/09 08:52:10 damien Exp $ */
+/* $OpenBSD: ueagle.c,v 1.17 2007/06/09 12:22:53 mbalmer Exp $ */
/*-
* Copyright (c) 2003-2006
@@ -1461,7 +1461,6 @@ ueagle_activate(device_ptr_t self, enum devact act)
break;
case DVACT_DEACTIVATE:
- if_deactivate(&sc->sc_if);
sc->gone = 1;
break;
}
diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h
index 8096c775cc7..9ec41ea03d9 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/dev/usb/usb_port.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usb_port.h,v 1.72 2007/06/09 12:03:39 mbalmer Exp $ */
+/* $OpenBSD: usb_port.h,v 1.73 2007/06/09 12:22:53 mbalmer Exp $ */
/* $NetBSD: usb_port.h,v 1.62 2003/02/15 18:33:30 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_port.h,v 1.21 1999/11/17 22:33:47 n_hibma Exp $ */
@@ -105,7 +105,6 @@ typedef struct proc *usb_proc_ptr;
#define sel_klist si_note
-#define if_deactivate(x)
#define IF_INPUT(ifp, m) ether_input_mbuf((ifp), (m))
#define swap_bytes_change_sign16_le swap_bytes_change_sign16
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 06:26:57 +0000