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: (22 commits)
  pcmcia: synclink_cs: fix information leak to userland
  pcmcia: don't call flush_scheduled_work() spuriously
  serial_cs: drop spurious flush_scheduled_work() call
  pcmcia/yenta: guide users in case of problems with O2-bridges
  pcmcia: fix unused function compile warning
  pcmcia: vrc4173_cardu: Fix error path for pci_release_regions and pci_disable_device
  pcmcia: add a few debug statements
  pcmcia: remove obsolete and wrong comments
  pcmcia: avoid messages on module (un)loading
  pcmcia: move driver name to struct pcmcia_driver
  pcmcia: remove the "Finally, report what we've done" message
  pcmcia: use autoconfiguration feature for ioports and iomem
  pcmcia: introduce autoconfiguration feature
  pcmcia: Documentation update
  pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device
  pcmcia: move config_{base,index,regs} to struct pcmcia_device
  pcmcia: simplify IntType
  pcmcia: simplify Status, ExtStatus register access
  pcmcia: remove Pin, Copy configuration register access
  pcmcia: move Vpp setup to struct pcmcia_device
  ...

3 files changed, 59 insertions, 122 deletions

diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
deleted file mode 100644
index 68d8bde7e8d6..000000000000
--- a/include/pcmcia/cs.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * cs.h
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * The initial developer of the original code is David A. Hinds
- * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
- * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
- *
- * (C) 1999             David A. Hinds
- */
-
-#ifndef _LINUX_CS_H
-#define _LINUX_CS_H
-
-#ifdef __KERNEL__
-#include <linux/interrupt.h>
-#endif
-
-/* ModifyConfiguration */
-typedef struct modconf_t {
-    u_int       Attributes;
-    u_int       Vcc, Vpp1, Vpp2;
-} modconf_t;
-
-/* Attributes for ModifyConfiguration */
-#define CONF_IRQ_CHANGE_VALID   0x0100
-#define CONF_VCC_CHANGE_VALID   0x0200
-#define CONF_VPP1_CHANGE_VALID  0x0400
-#define CONF_VPP2_CHANGE_VALID  0x0800
-#define CONF_IO_CHANGE_WIDTH    0x1000
-
-/* For RequestConfiguration */
-typedef struct config_req_t {
-    u_int       Attributes;
-    u_int       Vpp; /* both Vpp1 and Vpp2 */
-    u_int       IntType;
-    u_int       ConfigBase;
-    u_char      Status, Pin, Copy, ExtStatus;
-    u_char      ConfigIndex;
-    u_int       Present;
-} config_req_t;
-
-/* Attributes for RequestConfiguration */
-#define CONF_ENABLE_IRQ         0x01
-#define CONF_ENABLE_DMA         0x02
-#define CONF_ENABLE_SPKR        0x04
-#define CONF_ENABLE_PULSE_IRQ   0x08
-#define CONF_VALID_CLIENT       0x100
-
-/* IntType field */
-#define INT_MEMORY              0x01
-#define INT_MEMORY_AND_IO       0x02
-#define INT_CARDBUS             0x04
-#define INT_ZOOMED_VIDEO        0x08
-
-/* Configuration registers present */
-#define PRESENT_OPTION          0x001
-#define PRESENT_STATUS          0x002
-#define PRESENT_PIN_REPLACE     0x004
-#define PRESENT_COPY            0x008
-#define PRESENT_EXT_STATUS      0x010
-#define PRESENT_IOBASE_0        0x020
-#define PRESENT_IOBASE_1        0x040
-#define PRESENT_IOBASE_2        0x080
-#define PRESENT_IOBASE_3        0x100
-#define PRESENT_IOSIZE          0x200
-
-/* For RequestWindow */
-typedef struct win_req_t {
-    u_int       Attributes;
-    u_long      Base;
-    u_int       Size;
-    u_int       AccessSpeed;
-} win_req_t;
-
-/* Attributes for RequestWindow */
-#define WIN_MEMORY_TYPE_CM      0x00 /* default */
-#define WIN_MEMORY_TYPE_AM      0x20 /* MAP_ATTRIB */
-#define WIN_DATA_WIDTH_8        0x00 /* default */
-#define WIN_DATA_WIDTH_16       0x02 /* MAP_16BIT */
-#define WIN_ENABLE              0x01 /* MAP_ACTIVE */
-#define WIN_USE_WAIT            0x40 /* MAP_USE_WAIT */
-
-#define WIN_FLAGS_MAP           0x63 /* MAP_ATTRIB | MAP_16BIT | MAP_ACTIVE |
-                                        MAP_USE_WAIT */
-#define WIN_FLAGS_REQ           0x1c /* mapping to socket->win[i]:
-                                        0x04 -> 0
-                                        0x08 -> 1
-                                        0x0c -> 2
-                                        0x10 -> 3 */
-
-#endif /* _LINUX_CS_H */
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index 70c58ed2278c..d830c87ff0a7 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -24,9 +24,11 @@
 
 #ifdef __KERNEL__
 #include <linux/device.h>
+#include <linux/interrupt.h>
 #include <pcmcia/ss.h>
 #include <asm/atomic.h>
 
+
 /*
  * PCMCIA device drivers (16-bit cards only; 32-bit cards require CardBus
  * a.k.a. PCI drivers
@@ -36,8 +38,6 @@ struct pcmcia_device;
 struct config_t;
 struct net_device;
 
-typedef struct resource *window_handle_t;
-
 /* dynamic device IDs for PCMCIA device drivers. See
  * Documentation/pcmcia/driver.txt for details.
 */
@@ -47,6 +47,8 @@ struct pcmcia_dynids {
 };
 
 struct pcmcia_driver {
+        const char              *name;
+
         int (*probe)            (struct pcmcia_device *dev);
         void (*remove)          (struct pcmcia_device *dev);
 
@@ -90,15 +92,17 @@ struct pcmcia_device {
 
         struct list_head        socket_device_list;
 
-        /* deprecated, will be cleaned up soon */
-        config_req_t            conf;
-        window_handle_t         win;
-
         /* device setup */
         unsigned int            irq;
         struct resource         *resource[PCMCIA_NUM_RESOURCES];
+        resource_size_t         card_addr;      /* for the 1st IOMEM resource */
+        unsigned int            vpp;
 
-        unsigned int            io_lines; /* number of I/O lines */
+        unsigned int            config_flags;   /* CONF_ENABLE_ flags below */
+        unsigned int            config_base;
+        unsigned int            config_index;
+        unsigned int            config_regs;    /* PRESENT_ flags below */
+        unsigned int            io_lines;       /* number of I/O lines */
 
         /* Is the device suspended? */
         u16                     suspended:1;
@@ -174,9 +178,6 @@ int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse);
 /* loop CIS entries for valid configuration */
 int pcmcia_loop_config(struct pcmcia_device *p_dev,
                        int      (*conf_check)   (struct pcmcia_device *p_dev,
-                                                 cistpl_cftable_entry_t *cf,
-                                                 cistpl_cftable_entry_t *dflt,
-                                                 unsigned int vcc,
                                                  void *priv_data),
                        void *priv_data);
 
@@ -206,16 +207,17 @@ pcmcia_request_exclusive_irq(struct pcmcia_device *p_dev,
 int __must_check pcmcia_request_irq(struct pcmcia_device *p_dev,
                                 irq_handler_t handler);
 
-int pcmcia_request_configuration(struct pcmcia_device *p_dev,
-                                 config_req_t *req);
+int pcmcia_enable_device(struct pcmcia_device *p_dev);
 
-int pcmcia_request_window(struct pcmcia_device *p_dev, win_req_t *req,
-                          window_handle_t *wh);
-int pcmcia_release_window(struct pcmcia_device *p_dev, window_handle_t win);
-int pcmcia_map_mem_page(struct pcmcia_device *p_dev, window_handle_t win,
+int pcmcia_request_window(struct pcmcia_device *p_dev, struct resource *res,
+                        unsigned int speed);
+int pcmcia_release_window(struct pcmcia_device *p_dev, struct resource *res);
+int pcmcia_map_mem_page(struct pcmcia_device *p_dev, struct resource *res,
                         unsigned int offset);
 
-int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod);
+int pcmcia_fixup_vpp(struct pcmcia_device *p_dev, unsigned char new_vpp);
+int pcmcia_fixup_iowidth(struct pcmcia_device *p_dev);
+
 void pcmcia_disable_device(struct pcmcia_device *p_dev);
 
 /* IO ports */
@@ -224,15 +226,46 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev);
 #define IO_DATA_PATH_WIDTH_16   0x08
 #define IO_DATA_PATH_WIDTH_AUTO 0x10
 
-/* convert flag found in cfgtable to data path width parameter */
-static inline int pcmcia_io_cfg_data_width(unsigned int flags)
-{
-        if (!(flags & CISTPL_IO_8BIT))
-                return IO_DATA_PATH_WIDTH_16;
-        if (!(flags & CISTPL_IO_16BIT))
-                return IO_DATA_PATH_WIDTH_8;
-        return IO_DATA_PATH_WIDTH_AUTO;
-}
+/* IO memory */
+#define WIN_MEMORY_TYPE_CM      0x00 /* default */
+#define WIN_MEMORY_TYPE_AM      0x20 /* MAP_ATTRIB */
+#define WIN_DATA_WIDTH_8        0x00 /* default */
+#define WIN_DATA_WIDTH_16       0x02 /* MAP_16BIT */
+#define WIN_ENABLE              0x01 /* MAP_ACTIVE */
+#define WIN_USE_WAIT            0x40 /* MAP_USE_WAIT */
+
+#define WIN_FLAGS_MAP           0x63 /* MAP_ATTRIB | MAP_16BIT | MAP_ACTIVE |
+                                        MAP_USE_WAIT */
+#define WIN_FLAGS_REQ           0x1c /* mapping to socket->win[i]:
+                                        0x04 -> 0
+                                        0x08 -> 1
+                                        0x0c -> 2
+                                        0x10 -> 3 */
+
+/* config_reg{ister}s present for this PCMCIA device */
+#define PRESENT_OPTION          0x001
+#define PRESENT_STATUS          0x002
+#define PRESENT_PIN_REPLACE     0x004
+#define PRESENT_COPY            0x008
+#define PRESENT_EXT_STATUS      0x010
+#define PRESENT_IOBASE_0        0x020
+#define PRESENT_IOBASE_1        0x040
+#define PRESENT_IOBASE_2        0x080
+#define PRESENT_IOBASE_3        0x100
+#define PRESENT_IOSIZE          0x200
+
+/* flags to be passed to pcmcia_enable_device() */
+#define CONF_ENABLE_IRQ         0x0001
+#define CONF_ENABLE_SPKR        0x0002
+#define CONF_ENABLE_PULSE_IRQ   0x0004
+#define CONF_ENABLE_ESR         0x0008
+
+/* flags used by pcmcia_loop_config() autoconfiguration */
+#define CONF_AUTO_CHECK_VCC     0x0100 /* check for matching Vcc? */
+#define CONF_AUTO_SET_VPP       0x0200 /* set Vpp? */
+#define CONF_AUTO_AUDIO         0x0400 /* enable audio line? */
+#define CONF_AUTO_SET_IO        0x0800 /* set ->resource[0,1] */
+#define CONF_AUTO_SET_IOMEM     0x1000 /* set ->resource[2] */
 
 #endif /* __KERNEL__ */
 
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 626b63c33d9e..731cde010f42 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -19,7 +19,6 @@
 #include <linux/sched.h>        /* task_struct, completion */
 #include <linux/mutex.h>
 
-#include <pcmcia/cs.h>
 #ifdef CONFIG_CARDBUS
 #include <linux/pci.h>
 #endif