patch-2.3.30 linux/drivers/pcmcia/cs.c

Next file: linux/drivers/pcmcia/ds.c
Previous file: linux/drivers/pci/setup.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.29/linux/drivers/pcmcia/cs.c linux/drivers/pcmcia/cs.c
@@ -327,15 +327,10 @@
 #ifdef CONFIG_PROC_FS
 	if (proc_pccard) {
 	    char name[3];
-#ifdef PCMCIA_DEBUG
-	    struct proc_dir_entry *ent;
-#endif
 	    sprintf(name, "%02d", i);
-	    s->proc = create_proc_entry(name, S_IFDIR, proc_pccard);
+	    s->proc = proc_mkdir(name, proc_pccard);
 #ifdef PCMCIA_DEBUG
-	    ent = create_proc_entry("clients", 0, s->proc);
-	    ent->read_proc = proc_read_clients;
-	    ent->data = s;
+	    create_proc_read_entry("clients",0,s->proc,proc_read_clients,s);
 #endif
 	    ss_entry(ns, SS_ProcSetup, s->proc);
 	}
@@ -2236,7 +2231,7 @@
 	apm_register_callback(&handle_apm_event);
 #endif
 #ifdef CONFIG_PROC_FS
-    proc_pccard = create_proc_entry("pccard", S_IFDIR, proc_bus);
+    proc_pccard = proc_mkdir("pccard", proc_bus);
 #endif
     return 0;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)