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

3 files changed, 9 insertions, 10 deletions

diff --git a/include/pcmcia/cs.h b/include/pcmcia/cs.h
index 2cab39f49eb2..52660f32663d 100644
--- a/include/pcmcia/cs.h
+++ b/include/pcmcia/cs.h
@@ -382,7 +382,6 @@ enum service {
 struct pcmcia_socket;
 
 int pcmcia_access_configuration_register(struct pcmcia_device *p_dev, conf_reg_t *reg);
-int pcmcia_deregister_client(struct pcmcia_device *p_dev);
 int pcmcia_get_configuration_info(struct pcmcia_device *p_dev, config_info_t *config);
 int pcmcia_get_first_window(window_handle_t *win, win_req_t *req);
 int pcmcia_get_next_window(window_handle_t *win, win_req_t *req);
@@ -390,7 +389,6 @@ int pcmcia_get_status(struct pcmcia_device *p_dev, cs_status_t *status);
 int pcmcia_get_mem_page(window_handle_t win, memreq_t *req);
 int pcmcia_map_mem_page(window_handle_t win, memreq_t *req);
 int pcmcia_modify_configuration(struct pcmcia_device *p_dev, modconf_t *mod);
-int pcmcia_register_client(client_handle_t *handle, client_reg_t *req);
 int pcmcia_release_configuration(struct pcmcia_device *p_dev);
 int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req);
 int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req);
diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index cb8b6e6ce66c..8e2a96396478 100644
--- a/include/pcmcia/ds.h
+++ b/include/pcmcia/ds.h
@@ -133,10 +133,12 @@ typedef struct dev_link_t {
 struct pcmcia_socket;
 
 struct pcmcia_driver {
-        dev_link_t              *(*attach)(void);
-        int (*event)            (event_t event, int priority,
-                                 event_callback_args_t *);
-        void                    (*detach)(dev_link_t *);
+        int (*probe)            (struct pcmcia_device *dev);
+        void (*remove)          (struct pcmcia_device *dev);
+
+        int (*suspend)          (struct pcmcia_device *dev);
+        int (*resume)           (struct pcmcia_device *dev);
+
         struct module           *owner;
         struct pcmcia_device_id *id_table;
         struct device_driver    drv;
@@ -164,7 +166,6 @@ struct pcmcia_device {
         /* deprecated, a cleaned up version will be moved into this
            struct soon */
         dev_link_t              *instance;
-        event_callback_args_t   event_callback_args;
         u_int                   state;
 
         /* information about this device */
@@ -193,6 +194,8 @@ struct pcmcia_device {
 #define handle_to_pdev(handle) (handle)
 #define handle_to_dev(handle) (handle->dev)
 
+#define dev_to_instance(dev) (dev->instance)
+
 /* error reporting */
 void cs_error(client_handle_t handle, int func, int ret);
 
diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index e788bbc5657d..2889a69a7a8f 100644
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -118,16 +118,14 @@ struct pcmcia_socket;
 struct pccard_operations {
         int (*init)(struct pcmcia_socket *sock);
         int (*suspend)(struct pcmcia_socket *sock);
-        int (*register_callback)(struct pcmcia_socket *sock, void (*handler)(void *, unsigned int), void * info);
         int (*get_status)(struct pcmcia_socket *sock, u_int *value);
-        int (*get_socket)(struct pcmcia_socket *sock, socket_state_t *state);
         int (*set_socket)(struct pcmcia_socket *sock, socket_state_t *state);
         int (*set_io_map)(struct pcmcia_socket *sock, struct pccard_io_map *io);
         int (*set_mem_map)(struct pcmcia_socket *sock, struct pccard_mem_map *mem);
 };
 
 struct pccard_resource_ops {
-        void    (*validate_mem)         (struct pcmcia_socket *s);
+        int     (*validate_mem)         (struct pcmcia_socket *s);
         int     (*adjust_io_region)     (struct resource *res,
                                          unsigned long r_start,
                                          unsigned long r_end,