2 files changed, 22 insertions, 26 deletions
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c
index 6d514b5462fd..ef46a2d88539 100644
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@ -191,25 +191,23 @@ static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
        /* IO window settings */
-        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
-                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
-                if (!(io->flags & CISTPL_IO_8BIT))
+                p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                p_dev->resource[0]->flags |=
-                if (!(io->flags & CISTPL_IO_16BIT))
+                        pcmcia_io_cfg_data_width(io->flags);
-                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->resource[0]->start = io->win[0].base;
-                p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                p_dev->resource[0]->end = io->win[0].len;
-                p_dev->io.BasePort1 = io->win[0].base;
-                p_dev->io.NumPorts1 = io->win[0].len;
                if (io->nwin > 1) {
-                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->resource[1]->flags = p_dev->resource[0]->flags;
-                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->resource[1]->start = io->win[1].base;
-                        p_dev->io.NumPorts2 = io->win[1].len;
+                        p_dev->resource[1]->end = io->win[1].len;
                }
                /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                if (pcmcia_request_io(p_dev) != 0)
                        goto next_entry;
        }
        return 0;
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c
index 4f8f55eab955..873877e17e1b 100644
--- a/drivers/net/wireless/orinoco/spectrum_cs.c
+++ b/drivers/net/wireless/orinoco/spectrum_cs.c
@@ -253,25 +253,23 @@ static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
        /* IO window settings */
-        p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
+        p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
        if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
-                p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
+                p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
-                if (!(io->flags & CISTPL_IO_8BIT))
+                p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
-                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
+                p_dev->resource[0]->flags |=
-                if (!(io->flags & CISTPL_IO_16BIT))
+                        pcmcia_io_cfg_data_width(io->flags);
-                        p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                p_dev->resource[0]->start = io->win[0].base;
-                p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
+                p_dev->resource[0]->end = io->win[0].len;
-                p_dev->io.BasePort1 = io->win[0].base;
-                p_dev->io.NumPorts1 = io->win[0].len;
                if (io->nwin > 1) {
-                        p_dev->io.Attributes2 = p_dev->io.Attributes1;
+                        p_dev->resource[1]->flags = p_dev->resource[0]->flags;
-                        p_dev->io.BasePort2 = io->win[1].base;
+                        p_dev->resource[1]->start = io->win[1].base;
-                        p_dev->io.NumPorts2 = io->win[1].len;
+                        p_dev->resource[1]->end = io->win[1].len;
                }
                /* This reserves IO space but doesn't actually enable it */
-                if (pcmcia_request_io(p_dev, &p_dev->io) != 0)
+                if (pcmcia_request_io(p_dev) != 0)
                        goto next_entry;
        }
        return 0;

diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c index 6d514b5462fd..ef46a2d88539 100644 --- a/drivers/net/wireless/orinoco/orinoco_cs.c +++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@ -191,25 +191,23 @@ static int orinoco_cs_config_check(struct pcmcia_device *p_dev,
191	p_dev->conf.Attributes \|= CONF_ENABLE_IRQ;	191	p_dev->conf.Attributes \|= CONF_ENABLE_IRQ;
192		192
193	/* IO window settings */	193	/* IO window settings */
194	p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;	194	p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
195	if ((cfg->io.nwin > 0) \|\| (dflt->io.nwin > 0)) {	195	if ((cfg->io.nwin > 0) \|\| (dflt->io.nwin > 0)) {
196	cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;	196	cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
197	p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;	197	p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
198	if (!(io->flags & CISTPL_IO_8BIT))	198	p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
199	p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;	199	p_dev->resource[0]->flags \|=
200	if (!(io->flags & CISTPL_IO_16BIT))	200	pcmcia_io_cfg_data_width(io->flags);
201	p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;	201	p_dev->resource[0]->start = io->win[0].base;
202	p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;	202	p_dev->resource[0]->end = io->win[0].len;
203	p_dev->io.BasePort1 = io->win[0].base;
204	p_dev->io.NumPorts1 = io->win[0].len;
205	if (io->nwin > 1) {	203	if (io->nwin > 1) {
206	p_dev->io.Attributes2 = p_dev->io.Attributes1;	204	p_dev->resource[1]->flags = p_dev->resource[0]->flags;
207	p_dev->io.BasePort2 = io->win[1].base;	205	p_dev->resource[1]->start = io->win[1].base;
208	p_dev->io.NumPorts2 = io->win[1].len;	206	p_dev->resource[1]->end = io->win[1].len;
209	}	207	}
210		208
211	/* This reserves IO space but doesn't actually enable it */	209	/* This reserves IO space but doesn't actually enable it */
212	if (pcmcia_request_io(p_dev, &p_dev->io) != 0)	210	if (pcmcia_request_io(p_dev) != 0)
213	goto next_entry;	211	goto next_entry;
214	}	212	}
215	return 0;	213	return 0;


diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c index 4f8f55eab955..873877e17e1b 100644 --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c
@@ -253,25 +253,23 @@ static int spectrum_cs_config_check(struct pcmcia_device *p_dev,
253	p_dev->conf.Attributes \|= CONF_ENABLE_IRQ;	253	p_dev->conf.Attributes \|= CONF_ENABLE_IRQ;
254		254
255	/* IO window settings */	255	/* IO window settings */
256	p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;	256	p_dev->resource[0]->end = p_dev->resource[1]->end = 0;
257	if ((cfg->io.nwin > 0) \|\| (dflt->io.nwin > 0)) {	257	if ((cfg->io.nwin > 0) \|\| (dflt->io.nwin > 0)) {
258	cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;	258	cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
259	p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;	259	p_dev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
260	if (!(io->flags & CISTPL_IO_8BIT))	260	p_dev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
261	p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_16;	261	p_dev->resource[0]->flags \|=
262	if (!(io->flags & CISTPL_IO_16BIT))	262	pcmcia_io_cfg_data_width(io->flags);
263	p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;	263	p_dev->resource[0]->start = io->win[0].base;
264	p_dev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;	264	p_dev->resource[0]->end = io->win[0].len;
265	p_dev->io.BasePort1 = io->win[0].base;
266	p_dev->io.NumPorts1 = io->win[0].len;
267	if (io->nwin > 1) {	265	if (io->nwin > 1) {
268	p_dev->io.Attributes2 = p_dev->io.Attributes1;	266	p_dev->resource[1]->flags = p_dev->resource[0]->flags;
269	p_dev->io.BasePort2 = io->win[1].base;	267	p_dev->resource[1]->start = io->win[1].base;
270	p_dev->io.NumPorts2 = io->win[1].len;	268	p_dev->resource[1]->end = io->win[1].len;
271	}	269	}
272		270
273	/* This reserves IO space but doesn't actually enable it */	271	/* This reserves IO space but doesn't actually enable it */
274	if (pcmcia_request_io(p_dev, &p_dev->io) != 0)	272	if (pcmcia_request_io(p_dev) != 0)
275	goto next_entry;	273	goto next_entry;
276	}	274	}
277	return 0;	275	return 0;