Module Name: src
Committed By: dyoung
Date: Mon Mar 22 23:03:30 UTC 2010
Modified Files:
src/sys/dev/cardbus: if_ex_cardbus.c
src/sys/dev/ic: elinkxlvar.h
src/sys/dev/pci: if_ex_pci.c
Log Message:
ex_softc.ex_bustype is written but never read. Just get rid of it.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/cardbus/if_ex_cardbus.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/ic/elinkxlvar.h
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/pci/if_ex_pci.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/cardbus/if_ex_cardbus.c
diff -u src/sys/dev/cardbus/if_ex_cardbus.c:1.53 src/sys/dev/cardbus/if_ex_cardbus.c:1.54
--- src/sys/dev/cardbus/if_ex_cardbus.c:1.53 Mon Mar 22 17:23:44 2010
+++ src/sys/dev/cardbus/if_ex_cardbus.c Mon Mar 22 23:03:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_cardbus.c,v 1.53 2010/03/22 17:23:44 dyoung Exp $ */
+/* $NetBSD: if_ex_cardbus.c,v 1.54 2010/03/22 23:03:30 dyoung Exp $ */
/*
* Copyright (c) 1998 and 1999
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.53 2010/03/22 17:23:44 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_cardbus.c,v 1.54 2010/03/22 23:03:30 dyoung Exp $");
/* #define EX_DEBUG 4 */ /* define to report information for debugging */
@@ -221,7 +221,6 @@
sc->sc_dev = self;
- sc->ex_bustype = EX_BUS_CARDBUS;
sc->sc_dmat = ca->ca_dmat;
csc->sc_ct = ca->ca_ct;
csc->sc_intrline = ca->ca_intrline;
Index: src/sys/dev/ic/elinkxlvar.h
diff -u src/sys/dev/ic/elinkxlvar.h:1.21 src/sys/dev/ic/elinkxlvar.h:1.22
--- src/sys/dev/ic/elinkxlvar.h:1.21 Mon Mar 22 17:11:19 2010
+++ src/sys/dev/ic/elinkxlvar.h Mon Mar 22 23:03:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxlvar.h,v 1.21 2010/03/22 17:11:19 dyoung Exp $ */
+/* $NetBSD: elinkxlvar.h,v 1.22 2010/03/22 23:03:30 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -109,11 +109,6 @@
#define EX_FLAGS_POWERMGMT 0x2000
#define EX_FLAGS_ATTACHED 0x4000 /* attach has succeeded */
- u_char ex_bustype; /* parent bus type (currently unused) */
-
-#define EX_BUS_PCI 0
-#define EX_BUS_CARDBUS 1
-
#if NRND > 0
rndsource_element_t rnd_source;
#endif
Index: src/sys/dev/pci/if_ex_pci.c
diff -u src/sys/dev/pci/if_ex_pci.c:1.52 src/sys/dev/pci/if_ex_pci.c:1.53
--- src/sys/dev/pci/if_ex_pci.c:1.52 Mon Mar 22 17:20:42 2010
+++ src/sys/dev/pci/if_ex_pci.c Mon Mar 22 23:03:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_pci.c,v 1.52 2010/03/22 17:20:42 dyoung Exp $ */
+/* $NetBSD: if_ex_pci.c,v 1.53 2010/03/22 23:03:30 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.52 2010/03/22 17:20:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.53 2010/03/22 23:03:30 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -233,7 +233,6 @@
sc->sc_dmat = pa->pa_dmat;
- sc->ex_bustype = EX_BUS_PCI;
sc->ex_conf = epp->epp_flags;
/* Enable the card. */
