Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
  pcmcia: do not request windows if you don't need to
  pcmcia: insert PCMCIA device resources into resource tree
  pcmcia: export resource information to sysfs
  pcmcia: use struct resource for PCMCIA devices, part 2
  pcmcia: remove memreq_t
  pcmcia: move local definitions out of include/pcmcia/cs.h
  pcmcia: do not use io_req_t when calling pcmcia_request_io()
  pcmcia: do not use io_req_t after call to pcmcia_request_io()
  pcmcia: use struct resource for PCMCIA devices
  pcmcia: clean up cs.h
  pcmcia: use pcmica_{read,write}_config_byte
  pcmcia: remove cs_types.h
  pcmcia: remove unused flag, simplify headers
  pcmcia: remove obsolete CS_EVENT_ definitions
  pcmcia: split up central event handler
  pcmcia: simplify event callback
  pcmcia: remove obsolete ioctl

Conflicts in:
 - drivers/staging/comedi/drivers/*
 - drivers/staging/wlags49_h2/wl_cs.c
due to dev_info_t and whitespace changes

1 files changed, 19 insertions, 19 deletions

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 118c28e8abaf..e944aa0c5517 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -34,7 +34,6 @@
 #include <linux/ata.h>
 #include <linux/libata.h>
 
-#include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/cistpl.h>
 #include <pcmcia/ds.h>
@@ -201,23 +200,25 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
 
         if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
                 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;
-                pdev->io.BasePort1 = io->win[0].base;
-                pdev->io.IOAddrLines = io->flags & CISTPL_IO_LINES_MASK;
-                if (!(io->flags & CISTPL_IO_16BIT))
-                        pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
+                pdev->io_lines = io->flags & CISTPL_IO_LINES_MASK;
+                pdev->resource[0]->start = io->win[0].base;
+                if (!(io->flags & CISTPL_IO_16BIT)) {
+                        pdev->resource[0]->flags &= ~IO_DATA_PATH_WIDTH;
+                        pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;
+                }
                 if (io->nwin == 2) {
-                        pdev->io.NumPorts1 = 8;
-                        pdev->io.BasePort2 = io->win[1].base;
-                        pdev->io.NumPorts2 = (stk->is_kme) ? 2 : 1;
-                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                        pdev->resource[0]->end = 8;
+                        pdev->resource[1]->start = io->win[1].base;
+                        pdev->resource[1]->end = (stk->is_kme) ? 2 : 1;
+                        if (pcmcia_request_io(pdev) != 0)
                                 return -ENODEV;
-                        stk->ctl_base = pdev->io.BasePort2;
+                        stk->ctl_base = pdev->resource[1]->start;
                 } else if ((io->nwin == 1) && (io->win[0].len >= 16)) {
-                        pdev->io.NumPorts1 = io->win[0].len;
-                        pdev->io.NumPorts2 = 0;
-                        if (pcmcia_request_io(pdev, &pdev->io) != 0)
+                        pdev->resource[0]->end = io->win[0].len;
+                        pdev->resource[1]->end = 0;
+                        if (pcmcia_request_io(pdev) != 0)
                                 return -ENODEV;
-                        stk->ctl_base = pdev->io.BasePort1 + 0x0e;
+                        stk->ctl_base = pdev->resource[0]->start + 0x0e;
                 } else
                         return -ENODEV;
                 /* If we've got this far, we're done */
@@ -246,9 +247,8 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
         struct ata_port_operations *ops = &pcmcia_port_ops;
 
         /* Set up attributes in order to probe card and get resources */
-        pdev->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
-        pdev->io.Attributes2 = IO_DATA_PATH_WIDTH_8;
-        pdev->io.IOAddrLines = 3;
+        pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
+        pdev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;
         pdev->conf.Attributes = CONF_ENABLE_IRQ;
         pdev->conf.IntType = INT_MEMORY_AND_IO;
 
@@ -271,7 +271,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
                 if (pcmcia_loop_config(pdev, pcmcia_check_one_config, stk))
                         goto failed; /* No suitable config found */
         }
-        io_base = pdev->io.BasePort1;
+        io_base = pdev->resource[0]->start;
         ctl_base = stk->ctl_base;
         if (!pdev->irq)
                 goto failed;
@@ -294,7 +294,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
 
         /* FIXME: Could be more ports at base + 0x10 but we only deal with
            one right now */
-        if (pdev->io.NumPorts1 >= 0x20)
+        if (resource_size(pdev->resource[0]) >= 0x20)
                 n_ports = 2;
 
         if (pdev->manf_id == 0x0097 && pdev->card_id == 0x1620)