patch-2.3.25 linux/drivers/nubus/proc.c

Next file: linux/drivers/parport/parport_pc.c
Previous file: linux/drivers/nubus/nubus.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.24/linux/drivers/nubus/proc.c linux/drivers/nubus/proc.c
@@ -60,13 +60,6 @@
 	return (count > cnt) ? cnt : count;
 }
 
-static struct proc_dir_entry proc_nubus_devices = {
-	PROC_BUS_NUBUS_DEVICES, 7, "devices",
-	S_IFREG | S_IRUGO, 1, 0, 0,
-	0, &proc_array_inode_operations,
-	get_nubus_dev_info
-};
-
 static struct proc_dir_entry *proc_bus_nubus_dir;
 
 static void nubus_proc_subdir(struct nubus_dev* dev,
@@ -178,6 +171,7 @@
 	if (!MACH_IS_MAC)
 		return;
 	proc_bus_nubus_dir = create_proc_entry("nubus", S_IFDIR, proc_bus);
-	proc_register(proc_bus_nubus_dir, &proc_nubus_devices);
+	create_proc_info_entry("devices", 0, proc_bus_nubus_dir,
+				get_nubus_dev_info);
 	proc_bus_nubus_add_devices();
 }

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