[PATCH] pcmcia: small bugfix & cleanup

Remove unneeded function declarations and correct /proc-directory name
for > 1 pcmcia_socket_class devices.

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index 09ba6f444328cf3fcd15cc48b90fca4fa4366c93..8b369d54669030a5a3d7b4a2dedc6aabe0a7ee72 100644 (file)
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -356,7 +356,7 @@ int pcmcia_register_socket(struct device *dev)
 #ifdef CONFIG_PROC_FS
                if (proc_pccard) {
                        char name[3];
-                       sprintf(name, "%02d", i);
+                       sprintf(name, "%02d", j);
                        s->proc = proc_mkdir(name, proc_pccard);
                        if (s->proc)
                                s->ss_entry->proc_setup(i, s->proc);

diff --git a/drivers/pcmcia/pci_socket.c b/drivers/pcmcia/pci_socket.c
index f22f148b5b08d9baf65f77eaff7862e5005a0920..67f0ecfa3b026501d3f42fbb6da42177b22fde2f 100644 (file)
--- a/drivers/pcmcia/pci_socket.c
+++ b/drivers/pcmcia/pci_socket.c
@@ -31,9 +31,6 @@
 #include "pci_socket.h"
 
 
-extern struct socket_info_t *pcmcia_register_socket (int slot,
-               struct pccard_operations *vtable, int use_bus_pm);
-extern void pcmcia_unregister_socket (struct socket_info_t *socket);
 extern void pcmcia_suspend_socket (struct socket_info_t *socket);
 extern void pcmcia_resume_socket (struct socket_info_t *socket);