[PATCH] namei.c: unlock missing in error case

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

diff --git a/include/pcmcia/ss.h b/include/pcmcia/ss.h
index 0f7aacc..2889a69 100644 (file)
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
@@ -17,10 +17,14 @@
 
 #include <linux/config.h>
 #include <linux/device.h>
+#include <linux/sched.h>       /* task_struct, completion */
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/cs.h>
 #include <pcmcia/bulkmem.h>
+#ifdef CONFIG_CARDBUS
+#include <linux/pci.h>
+#endif
 
 /* Definitions for card status flags for GetStatus */
 #define SS_WRPROT      0x0001
@@ -114,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,
@@ -233,7 +235,11 @@ struct pcmcia_socket {
 
        /* so is power hook */
        int (*power_hook)(struct pcmcia_socket *sock, int operation);
-                           
+#ifdef CONFIG_CARDBUS
+       /* allows tuning the CB bridge before loading driver for the CB card */
+       void (*tune_bridge)(struct pcmcia_socket *sock, struct pci_bus *bus);
+#endif
+
        /* state thread */
        struct semaphore                skt_sem;        /* protects socket h/w state */