cleanup - we don't have resource structure

ok jsg@

diff --git a/sys/dev/ic/acxvar.h b/sys/dev/ic/acxvar.h
index 2692dfd..6af4a3a 100644 (file)
--- a/sys/dev/ic/acxvar.h
+++ b/sys/dev/ic/acxvar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: acxvar.h,v 1.18 2007/07/18 18:10:31 damien Exp $ */
+/*     $OpenBSD: acxvar.h,v 1.19 2008/07/21 04:12:21 kevlo Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -352,7 +352,6 @@ struct acx_softc {
        /*
         * MMIO 1
         */
-       struct resource         *sc_mem1_res;
        bus_space_tag_t         sc_mem1_bt;
        bus_space_handle_t      sc_mem1_bh;
        int                     chip_mem1_rid;
@@ -360,15 +359,10 @@ struct acx_softc {
        /*
         * MMIO 2
         */
-       struct resource         *sc_mem2_res;
        bus_space_tag_t         sc_mem2_bt;
        bus_space_handle_t      sc_mem2_bh;
        int                     chip_mem2_rid;
 
-       struct resource         *sc_irq_res;
-       void                    *sc_irq_handle;
-       int                     sc_irq_rid;
-
        int                     (*sc_enable)(struct acx_softc *);
        void                    (*sc_disable)(struct acx_softc *);
        void                    (*sc_power)(struct acx_softc *, int);

diff --git a/sys/dev/ic/bwivar.h b/sys/dev/ic/bwivar.h
index 51cf5a9..3d25bc2 100644 (file)
--- a/sys/dev/ic/bwivar.h
+++ b/sys/dev/ic/bwivar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bwivar.h,v 1.23 2008/02/25 20:36:54 mglocker Exp $    */
+/*     $OpenBSD: bwivar.h,v 1.24 2008/07/21 04:12:21 kevlo Exp $       */
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -525,12 +525,6 @@ struct bwi_softc {
        uint16_t                 sc_pwron_delay;
        int                      sc_locale;
 
-       int                      sc_irq_rid;
-       struct resource         *sc_irq_res;
-       void                    *sc_irq_handle;
-
-       int                      sc_mem_rid;
-       struct resource         *sc_mem_res;
        bus_dma_tag_t            sc_dmat;
        bus_space_tag_t          sc_mem_bt;
        bus_space_handle_t       sc_mem_bh;

diff --git a/sys/dev/ic/dcreg.h b/sys/dev/ic/dcreg.h
index 98394af..9493818 100644 (file)
--- a/sys/dev/ic/dcreg.h
+++ b/sys/dev/ic/dcreg.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: dcreg.h,v 1.42 2005/05/22 03:47:16 martin Exp $ */
+/*     $OpenBSD: dcreg.h,v 1.43 2008/07/21 04:12:21 kevlo Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -721,8 +721,6 @@ struct dc_softc {
        void                    *dc_intrhand;
        void                    *sc_dhook;
        void                    *sc_pwrhook;
-       struct resource         *dc_irq;
-       struct resource         *dc_res;
        u_int8_t                dc_type;
        u_int8_t                dc_pmode;
        u_int8_t                dc_link;

diff --git a/sys/dev/pci/if_etreg.h b/sys/dev/pci/if_etreg.h
index 473cda1..3d72e68 100644 (file)
--- a/sys/dev/pci/if_etreg.h
+++ b/sys/dev/pci/if_etreg.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_etreg.h,v 1.3 2008/06/08 06:18:07 jsg Exp $        */
+/*     $OpenBSD: if_etreg.h,v 1.4 2008/07/21 04:12:21 kevlo Exp $      */
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -486,8 +486,6 @@ struct et_softc {
        struct arpcom           sc_arpcom;
        int                     sc_if_flags;
 
-       int                     sc_mem_rid;
-       struct resource         *sc_mem_res;
        bus_space_tag_t         sc_mem_bt;
        bus_space_handle_t      sc_mem_bh;
        bus_size_t              sc_mem_size;
@@ -495,8 +493,6 @@ struct et_softc {
        pci_chipset_tag_t       sc_pct;
        pcitag_t                sc_pcitag;
 
-       int                     sc_irq_rid;
-       struct resource         *sc_irq_res;
        void                    *sc_irq_handle;
 
        struct mii_data         sc_miibus;

diff --git a/sys/dev/pci/if_ipwvar.h b/sys/dev/pci/if_ipwvar.h
index ca0d5b7..22daa8a 100644 (file)
--- a/sys/dev/pci/if_ipwvar.h
+++ b/sys/dev/pci/if_ipwvar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_ipwvar.h,v 1.16 2008/04/16 18:32:15 damien Exp $   */
+/*     $OpenBSD: if_ipwvar.h,v 1.17 2008/07/21 04:12:21 kevlo Exp $    */
 
 /*-
  * Copyright (c) 2004-2006
@@ -94,8 +94,6 @@ struct ipw_softc {
        uint32_t                        flags;
 #define IPW_FLAG_FW_INITED     (1 << 0)
 
-       struct resource                 *irq;
-       struct resource                 *mem;
        bus_space_tag_t                 sc_st;
        bus_space_handle_t              sc_sh;
        void                            *sc_ih;

diff --git a/sys/dev/pci/safevar.h b/sys/dev/pci/safevar.h
index 7b9fed2..7aa1c48 100644 (file)
--- a/sys/dev/pci/safevar.h
+++ b/sys/dev/pci/safevar.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: safevar.h,v 1.5 2003/08/20 16:28:35 jason Exp $       */
+/*     $OpenBSD: safevar.h,v 1.6 2008/07/21 04:12:21 kevlo Exp $       */
 
 /*-
  * Copyright (c) 2003 Sam Leffler, Errno Consulting
@@ -149,7 +149,6 @@ struct safe_pkq {
 
 struct safe_softc {
        struct device           sc_dev;         /* device backpointer */
-       struct resource         *sc_irq;
        void                    *sc_ih;         /* interrupt handler cookie */
        bus_space_handle_t      sc_sh;          /* memory handle */
        bus_space_tag_t         sc_st;          /* memory tag */