[PATCH] bcm43xx: heavily increase mac_suspend timeout.

[powerpc.git] / include / pcmcia / ds.h

diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index cb8b6e6..8e2a963 100644 (file)
--- 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);