Remove unused code.

ok oga@, jsg@, blambert@, zap zap zap deraadt@

2 files changed, 2 insertions, 58 deletions

diff --git a/sys/dev/cardbus/cardbus_map.c b/sys/dev/cardbus/cardbus_map.c
index 7db2e4bb632..9e8a4864535 100644
--- a/sys/dev/cardbus/cardbus_map.c
+++ b/sys/dev/cardbus/cardbus_map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardbus_map.c,v 1.8 2007/09/17 20:29:47 miod Exp $	*/
+/*	$OpenBSD: cardbus_map.c,v 1.9 2009/07/23 15:09:41 kettenis Exp $	*/
 /*	$NetBSD: cardbus_map.c,v 1.10 2000/03/07 00:31:46 mycroft Exp $	*/
 
 /*
@@ -350,55 +350,3 @@ cardbus_mapreg_unmap(struct cardbus_softc *sc, int func, int reg,
 
 	return (st);
 }
-
-/*
- * int cardbus_save_bar(cardbus_devfunc_t);
- *
- *   This function saves the Base Address Registers at the CardBus
- *   function denoted by the argument.
- */
-int
-cardbus_save_bar(cardbus_devfunc_t ct)
-{
-	cardbustag_t tag = Cardbus_make_tag(ct);
-	cardbus_chipset_tag_t cc = ct->ct_cc;
-	cardbus_function_tag_t cf = ct->ct_cf;
-
-	ct->ct_bar[0] = cardbus_conf_read(cc, cf, tag, CARDBUS_BASE0_REG);
-	ct->ct_bar[1] = cardbus_conf_read(cc, cf, tag, CARDBUS_BASE1_REG);
-	ct->ct_bar[2] = cardbus_conf_read(cc, cf, tag, CARDBUS_BASE2_REG);
-	ct->ct_bar[3] = cardbus_conf_read(cc, cf, tag, CARDBUS_BASE3_REG);
-	ct->ct_bar[4] = cardbus_conf_read(cc, cf, tag, CARDBUS_BASE4_REG);
-	ct->ct_bar[5] = cardbus_conf_read(cc, cf, tag, CARDBUS_BASE5_REG);
-
-	DPRINTF(("cardbus_save_bar: %x %x\n", ct->ct_bar[0], ct->ct_bar[1]));
-
-	Cardbus_free_tag(ct, tag);
-
-	return (0);
-}
-
-/*
- * int cardbus_restore_bar(cardbus_devfunc_t);
- *
- *   This function saves the Base Address Registers at the CardBus
- *   function denoted by the argument.
- */
-int
-cardbus_restore_bar(cardbus_devfunc_t ct)
-{
-	cardbustag_t tag = Cardbus_make_tag(ct);
-	cardbus_chipset_tag_t cc = ct->ct_cc;
-	cardbus_function_tag_t cf = ct->ct_cf;
-
-	cardbus_conf_write(cc, cf, tag, CARDBUS_BASE0_REG, ct->ct_bar[0]);
-	cardbus_conf_write(cc, cf, tag, CARDBUS_BASE1_REG, ct->ct_bar[1]);
-	cardbus_conf_write(cc, cf, tag, CARDBUS_BASE2_REG, ct->ct_bar[2]);
-	cardbus_conf_write(cc, cf, tag, CARDBUS_BASE3_REG, ct->ct_bar[3]);
-	cardbus_conf_write(cc, cf, tag, CARDBUS_BASE4_REG, ct->ct_bar[4]);
-	cardbus_conf_write(cc, cf, tag, CARDBUS_BASE5_REG, ct->ct_bar[5]);
-
-	Cardbus_free_tag(ct, tag);
-
-	return (0);
-}
diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h
index e8f706d3d5a..445be25ec98 100644
--- a/sys/dev/cardbus/cardbusvar.h
+++ b/sys/dev/cardbus/cardbusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardbusvar.h,v 1.12 2006/10/12 16:35:51 grange Exp $	*/
+/*	$OpenBSD: cardbusvar.h,v 1.13 2009/07/23 15:09:41 kettenis Exp $	*/
 /*	$NetBSD: cardbusvar.h,v 1.17 2000/04/02 19:11:37 mycroft Exp $	*/
 
 /*
@@ -276,7 +276,6 @@ typedef struct cardbus_devfunc {
 	rbus_tag_t ct_rbus_iot;		/* CardBus i/o rbus tag */
 	rbus_tag_t ct_rbus_memt;	/* CardBus mem rbus tag */
 
-	u_int32_t ct_bar[6];		/* Base Address Regs 0 to 6 */
 	u_int32_t ct_lc;		/* Latency timer and cache line size */
 	/* u_int32_t ct_cisreg; */	/* CIS reg: is it needed??? */
 
@@ -396,9 +395,6 @@ int	cardbus_mapreg_map(struct cardbus_softc *, int, int, cardbusreg_t,
 int	cardbus_mapreg_unmap(struct cardbus_softc *, int, int,
 	    bus_space_tag_t, bus_space_handle_t, bus_size_t);
 
-int	cardbus_save_bar(cardbus_devfunc_t);
-int	cardbus_restore_bar(cardbus_devfunc_t);
-
 int	cardbus_function_enable(struct cardbus_softc *, int function);
 int	cardbus_function_disable(struct cardbus_softc *, int function);