X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fpcmcia%2Fds.h;h=8e2a96396478a0d6a1d522b78a52c2768581d0a1;hb=921e485f98b11656cdcc39a37605e116e34cb315;hp=cb8b6e6ce66c9dc192aefc705aaa4999b07b82b8;hpb=ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489;p=powerpc.git

diff --git a/include/pcmcia/ds.h b/include/pcmcia/ds.h
index cb8b6e6ce6..8e2a963964 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);