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: (50 commits)
  pcmcia: rework the irq_req_t typedef
  pcmcia: remove deprecated handle_to_dev() macro
  pcmcia: pcmcia_request_window() doesn't need a pointer to a pointer
  pcmcia: remove unused "window_t" typedef
  pcmcia: move some window-related code to pcmcia_ioctl.c
  pcmcia: Change window_handle_t logic to unsigned long
  pcmcia: Pass struct pcmcia_socket to pcmcia_get_mem_page()
  pcmcia: Pass struct pcmcia_device to pcmcia_map_mem_page()
  pcmcia: Pass struct pcmcia_device to pcmcia_release_window()
  drivers/pcmcia: remove unnecessary kzalloc
  pcmcia: correct handling for Zoomed Video registers in topic.h
  pcmcia: fix printk formats
  pcmcia: autoload module pcmcia
  pcmcia/staging: update comedi drivers
  PCMCIA: stop duplicating pci_irq in soc_pcmcia_socket
  PCMCIA: ss: allow PCI IRQs > 255
  PCMCIA: soc_common: remove 'dev' member from soc_pcmcia_socket
  PCMCIA: soc_common: constify soc_pcmcia_socket ops member
  PCMCIA: sa1111: remove duplicated initializers
  PCMCIA: sa1111: wrap soc_pcmcia_socket to contain sa1111 specific data
  ...

1 files changed, 98 insertions, 99 deletions

diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index d600c2deff7..689d6a79ffc 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -118,11 +118,9 @@ static caddr_t remap_window(struct map_info *map, unsigned long to)
                 DEBUG(2, "Remapping window from 0x%8.8x to 0x%8.8x",
                       dev->offset, mrq.CardOffset);
                 mrq.Page = 0;
-                ret = pcmcia_map_mem_page(win, &mrq);
-                if (ret != 0) {
-                        cs_error(dev->p_dev, MapMemPage, ret);
+                ret = pcmcia_map_mem_page(dev->p_dev, win, &mrq);
+                if (ret != 0)
                         return NULL;
-                }
                 dev->offset = mrq.CardOffset;
         }
         return dev->win_base + (to & (dev->win_size-1));
@@ -327,8 +325,6 @@ static void pcmciamtd_set_vpp(struct map_info *map, int on)
 
         DEBUG(2, "dev = %p on = %d vpp = %d\n", dev, on, dev->vpp);
         ret = pcmcia_modify_configuration(link, &mod);
-        if (ret != 0)
-                cs_error(link, ModifyConfiguration, ret);
 }
 
 
@@ -348,107 +344,116 @@ static void pcmciamtd_release(struct pcmcia_device *link)
                         iounmap(dev->win_base);
                         dev->win_base = NULL;
                 }
-                pcmcia_release_window(link->win);
+                pcmcia_release_window(link, link->win);
         }
         pcmcia_disable_device(link);
 }
 
 
-static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link, int *new_name)
+#ifdef CONFIG_MTD_DEBUG
+static int pcmciamtd_cistpl_format(struct pcmcia_device *p_dev,
+                                tuple_t *tuple,
+                                void *priv_data)
 {
-        int rc;
-        tuple_t tuple;
         cisparse_t parse;
-        u_char buf[64];
-
-        tuple.Attributes = 0;
-        tuple.TupleData = (cisdata_t *)buf;
-        tuple.TupleDataMax = sizeof(buf);
-        tuple.TupleOffset = 0;
-        tuple.DesiredTuple = RETURN_FIRST_TUPLE;
-
-        rc = pcmcia_get_first_tuple(link, &tuple);
-        while (rc == 0) {
-                rc = pcmcia_get_tuple_data(link, &tuple);
-                if (rc != 0) {
-                        cs_error(link, GetTupleData, rc);
-                        break;
-                }
-                rc = pcmcia_parse_tuple(&tuple, &parse);
-                if (rc != 0) {
-                        cs_error(link, ParseTuple, rc);
-                        break;
-                }
 
-                switch(tuple.TupleCode) {
-                case  CISTPL_FORMAT: {
-                        cistpl_format_t *t = &parse.format;
-                        (void)t; /* Shut up, gcc */
-                        DEBUG(2, "Format type: %u, Error Detection: %u, offset = %u, length =%u",
-                              t->type, t->edc, t->offset, t->length);
-                        break;
+        if (!pcmcia_parse_tuple(tuple, &parse)) {
+                cistpl_format_t *t = &parse.format;
+                (void)t; /* Shut up, gcc */
+                DEBUG(2, "Format type: %u, Error Detection: %u, offset = %u, length =%u",
+                        t->type, t->edc, t->offset, t->length);
+        }
+        return -ENOSPC;
+}
 
-                }
+static int pcmciamtd_cistpl_jedec(struct pcmcia_device *p_dev,
+                                tuple_t *tuple,
+                                void *priv_data)
+{
+        cisparse_t parse;
+        int i;
 
-                case CISTPL_DEVICE: {
-                        cistpl_device_t *t = &parse.device;
-                        int i;
-                        DEBUG(2, "Common memory:");
-                        dev->pcmcia_map.size = t->dev[0].size;
-                        for(i = 0; i < t->ndev; i++) {
-                                DEBUG(2, "Region %d, type = %u", i, t->dev[i].type);
-                                DEBUG(2, "Region %d, wp = %u", i, t->dev[i].wp);
-                                DEBUG(2, "Region %d, speed = %u ns", i, t->dev[i].speed);
-                                DEBUG(2, "Region %d, size = %u bytes", i, t->dev[i].size);
-                        }
-                        break;
-                }
+        if (!pcmcia_parse_tuple(tuple, &parse)) {
+                cistpl_jedec_t *t = &parse.jedec;
+                for (i = 0; i < t->nid; i++)
+                        DEBUG(2, "JEDEC: 0x%02x 0x%02x", t->id[i].mfr, t->id[i].info);
+        }
+        return -ENOSPC;
+}
+#endif
 
-                case CISTPL_VERS_1: {
-                        cistpl_vers_1_t *t = &parse.version_1;
-                        int i;
-                        if(t->ns) {
-                                dev->mtd_name[0] = '\0';
-                                for(i = 0; i < t->ns; i++) {
-                                        if(i)
-                                                strcat(dev->mtd_name, " ");
-                                        strcat(dev->mtd_name, t->str+t->ofs[i]);
-                                }
-                        }
-                        DEBUG(2, "Found name: %s", dev->mtd_name);
-                        break;
-                }
+static int pcmciamtd_cistpl_device(struct pcmcia_device *p_dev,
+                                tuple_t *tuple,
+                                void *priv_data)
+{
+        struct pcmciamtd_dev *dev = priv_data;
+        cisparse_t parse;
+        cistpl_device_t *t = &parse.device;
+        int i;
 
-                case CISTPL_JEDEC_C: {
-                        cistpl_jedec_t *t = &parse.jedec;
-                        int i;
-                        for(i = 0; i < t->nid; i++) {
-                                DEBUG(2, "JEDEC: 0x%02x 0x%02x", t->id[i].mfr, t->id[i].info);
-                        }
-                        break;
-                }
+        if (pcmcia_parse_tuple(tuple, &parse))
+                return -EINVAL;
+
+        DEBUG(2, "Common memory:");
+        dev->pcmcia_map.size = t->dev[0].size;
+        /* from here on: DEBUG only */
+        for (i = 0; i < t->ndev; i++) {
+                DEBUG(2, "Region %d, type = %u", i, t->dev[i].type);
+                DEBUG(2, "Region %d, wp = %u", i, t->dev[i].wp);
+                DEBUG(2, "Region %d, speed = %u ns", i, t->dev[i].speed);
+                DEBUG(2, "Region %d, size = %u bytes", i, t->dev[i].size);
+        }
+        return 0;
+}
 
-                case CISTPL_DEVICE_GEO: {
-                        cistpl_device_geo_t *t = &parse.device_geo;
-                        int i;
-                        dev->pcmcia_map.bankwidth = t->geo[0].buswidth;
-                        for(i = 0; i < t->ngeo; i++) {
-                                DEBUG(2, "region: %d bankwidth = %u", i, t->geo[i].buswidth);
-                                DEBUG(2, "region: %d erase_block = %u", i, t->geo[i].erase_block);
-                                DEBUG(2, "region: %d read_block = %u", i, t->geo[i].read_block);
-                                DEBUG(2, "region: %d write_block = %u", i, t->geo[i].write_block);
-                                DEBUG(2, "region: %d partition = %u", i, t->geo[i].partition);
-                                DEBUG(2, "region: %d interleave = %u", i, t->geo[i].interleave);
-                        }
-                        break;
-                }
+static int pcmciamtd_cistpl_geo(struct pcmcia_device *p_dev,
+                                tuple_t *tuple,
+                                void *priv_data)
+{
+        struct pcmciamtd_dev *dev = priv_data;
+        cisparse_t parse;
+        cistpl_device_geo_t *t = &parse.device_geo;
+        int i;
 
-                default:
-                        DEBUG(2, "Unknown tuple code %d", tuple.TupleCode);
-                }
+        if (pcmcia_parse_tuple(tuple, &parse))
+                return -EINVAL;
+
+        dev->pcmcia_map.bankwidth = t->geo[0].buswidth;
+        /* from here on: DEBUG only */
+        for (i = 0; i < t->ngeo; i++) {
+                DEBUG(2, "region: %d bankwidth = %u", i, t->geo[i].buswidth);
+                DEBUG(2, "region: %d erase_block = %u", i, t->geo[i].erase_block);
+                DEBUG(2, "region: %d read_block = %u", i, t->geo[i].read_block);
+                DEBUG(2, "region: %d write_block = %u", i, t->geo[i].write_block);
+                DEBUG(2, "region: %d partition = %u", i, t->geo[i].partition);
+                DEBUG(2, "region: %d interleave = %u", i, t->geo[i].interleave);
+        }
+        return 0;
+}
+
+
+static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link, int *new_name)
+{
+        int i;
 
-                rc = pcmcia_get_next_tuple(link, &tuple);
+        if (p_dev->prod_id[0]) {
+                dev->mtd_name[0] = '\0';
+                for (i = 0; i < 4; i++) {
+                        if (i)
+                                strcat(dev->mtd_name, " ");
+                        if (p_dev->prod_id[i])
+                                strcat(dev->mtd_name, p_dev->prod_id[i]);
+                }
+                DEBUG(2, "Found name: %s", dev->mtd_name);
         }
+
+#ifdef CONFIG_MTD_DEBUG
+        pcmcia_loop_tuple(p_dev, CISTPL_FORMAT, pcmciamtd_cistpl_format, NULL);
+        pcmcia_loop_tuple(p_dev, CISTPL_JEDEC_C, pcmciamtd_cistpl_jedec, NULL);
+#endif
+        pcmcia_loop_tuple(p_dev, CISTPL_DEVICE, pcmciamtd_cistpl_device, dev);
+        pcmcia_loop_tuple(p_dev, CISTPL_DEVICE_GEO, pcmciamtd_cistpl_geo, dev);
+
         if(!dev->pcmcia_map.size)
                 dev->pcmcia_map.size = MAX_PCMCIA_ADDR;
 
@@ -481,16 +486,12 @@ static void card_settings(struct pcmciamtd_dev *dev, struct pcmcia_device *link,
  * MTD device available to the system.
  */
 
-#define CS_CHECK(fn, ret) \
-do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
-
 static int pcmciamtd_config(struct pcmcia_device *link)
 {
         struct pcmciamtd_dev *dev = link->priv;
         struct mtd_info *mtd = NULL;
         cs_status_t status;
         win_req_t req;
-        int last_ret = 0, last_fn = 0;
         int ret;
         int i;
         static char *probes[] = { "jedec_probe", "cfi_probe" };
@@ -529,7 +530,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
                 int ret;
                 DEBUG(2, "requesting window with size = %dKiB memspeed = %d",
                       req.Size >> 10, req.AccessSpeed);
-                ret = pcmcia_request_window(&link, &req, &link->win);
+                ret = pcmcia_request_window(link, &req, &link->win);
                 DEBUG(2, "ret = %d dev->win_size = %d", ret, dev->win_size);
                 if(ret) {
                         req.Size >>= 1;
@@ -577,7 +578,6 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         DEBUG(2, "Setting Configuration");
         ret = pcmcia_request_configuration(link, &link->conf);
         if (ret != 0) {
-                cs_error(link, RequestConfiguration, ret);
                 if (dev->win_base) {
                         iounmap(dev->win_base);
                         dev->win_base = NULL;
@@ -652,8 +652,7 @@ static int pcmciamtd_config(struct pcmcia_device *link)
         link->dev_node = &dev->node;
         return 0;
 
- cs_failed:
-        cs_error(link, last_fn, last_ret);
+ failed:
         err("CS Error, exiting");
         pcmciamtd_release(link);
         return -ENODEV;