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

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

diff -u --recursive --new-file v2.3.29/linux/drivers/pcmcia/i82365.c linux/drivers/pcmcia/i82365.c
@@ -2602,26 +2602,15 @@
 static void pcic_proc_setup(u_short sock, struct proc_dir_entry *base)
 {
     socket_info_t *s = &socket[sock];
-    struct proc_dir_entry *ent;
-    ent = create_proc_entry("info", 0, base);
-    ent->read_proc = proc_read_info;
-    ent->data = s;
-    ent = create_proc_entry("exca", 0, base);
-    ent->read_proc = proc_read_exca;
-    ent->data = s;
+    create_proc_read_entry("info", 0, base, proc_read_info, s);
+    create_proc_read_entry("exca", 0, base, proc_read_exca, s);
 #ifdef CONFIG_PCI
-    if (s->flags & (IS_PCI|IS_CARDBUS)) {
-	ent = create_proc_entry("pci", 0, base);
-	ent->read_proc = proc_read_pci;
-	ent->data = s;
-    }
+    if (s->flags & (IS_PCI|IS_CARDBUS))
+	create_proc_read_entry("pci", 0, base, proc_read_pci, s);
 #endif
 #ifdef CONFIG_CARDBUS
-    if (s->flags & IS_CARDBUS) {
-	ent = create_proc_entry("cardbus", 0, base);
-	ent->read_proc = proc_read_cardbus;
-	ent->data = s;
-    }
+    if (s->flags & IS_CARDBUS)
+	create_proc_read_entry("cardbus", 0, base, proc_read_cardbus, s);
 #endif
     s->proc = base;
 }

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