Replace remaining references to "driverfs" with "sysfs".

Globally, s/driverfs/sysfs/g. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>

Replace remaining references to "driverfs" with "sysfs".
Globally, s/driverfs/sysfs/g. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
Robert P. J. Day · Adrian Bunk
1 parent ca820181fc
Showing 23 changed files with 53 additions and 53 deletions Side-by-side Diff
arch/i386/kernel/topology.c
arch/i386/oprofile/nmi_int.c
arch/parisc/kernel/topology.c
arch/x86_64/kernel/time.c
drivers/base/cpu.c
drivers/base/node.c
drivers/i2c/busses/i2c-ali1535.c
drivers/i2c/busses/i2c-ali15x3.c
drivers/i2c/busses/i2c-amd756.c
drivers/i2c/busses/i2c-amd8111.c
drivers/i2c/busses/i2c-i801.c
drivers/i2c/busses/i2c-piix4.c
drivers/i2c/busses/i2c-sis5595.c
drivers/i2c/busses/i2c-sis630.c
drivers/i2c/busses/i2c-sis96x.c
drivers/i2c/busses/i2c-via.c
drivers/scsi/osst.c
drivers/scsi/scsi_scan.c
drivers/scsi/st.c
drivers/usb/host/ehci-dbg.c
 /*
- * arch/i386/kernel/topology.c - Populate driverfs with topology information
+ * arch/i386/kernel/topology.c - Populate sysfs with topology information
  *
  * Written by: Matthew Dobson, IBM Corporation
  * Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL
@@ -63,7 +63,7 @@
 };
  
  
-static int __init init_driverfs(void)
+static int __init init_sysfs(void)
 {
 	int error;
 	if (!(error = sysdev_class_register(&oprofile_sysclass)))
  
@@ -72,15 +72,15 @@
 }
  
  
-static void exit_driverfs(void)
+static void exit_sysfs(void)
 {
 	sysdev_unregister(&device_oprofile);
 	sysdev_class_unregister(&oprofile_sysclass);
 }
  
 #else
-#define init_driverfs() do { } while (0)
-#define exit_driverfs() do { } while (0)
+#define init_sysfs() do { } while (0)
+#define exit_sysfs() do { } while (0)
 #endif /* CONFIG_PM */
  
 static int profile_exceptions_notify(struct notifier_block *self,
@@ -385,7 +385,7 @@
 	return 1;
 }
  
-/* in order to get driverfs right */
+/* in order to get sysfs right */
 static int using_nmi;
  
 int __init op_nmi_init(struct oprofile_operations *ops)
@@ -440,7 +440,7 @@
 			return -ENODEV;
 	}
  
-	init_driverfs();
+	init_sysfs();
 	using_nmi = 1;
 	ops->create_files = nmi_create_files;
 	ops->setup = nmi_setup;
@@ -456,6 +456,6 @@
 void op_nmi_exit(void)
 {
 	if (using_nmi)
-		exit_driverfs();
+		exit_sysfs();
 }
 /*
- * arch/parisc/kernel/topology.c - Populate driverfs with topology information
+ * arch/parisc/kernel/topology.c - Populate sysfs with topology information
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -418,7 +418,7 @@
 	set_kset_name("timer"),
 };
  
-/* XXX this driverfs stuff should probably go elsewhere later -john */
+/* XXX this sysfs stuff should probably go elsewhere later -john */
 static struct sys_device device_timer = {
 	.id	= 0,
 	.cls	= &timer_sysclass,
@@ -103,7 +103,7 @@
 #endif
  
 /*
- * register_cpu - Setup a driverfs device for a CPU.
+ * register_cpu - Setup a sysfs device for a CPU.
  * @cpu - cpu->hotpluggable field set to 1 will generate a control file in
  *	  sysfs for this CPU.
  * @num - CPU number to use when creating the device.
@@ -133,7 +133,7 @@
  
  
 /*
- * register_node - Setup a driverfs device for a node.
+ * register_node - Setup a sysfs device for a node.
  * @num - Node number to use when creating the device.
  *
  * Initialize and register the node device.
@@ -494,7 +494,7 @@
 		return -ENODEV;
 	}
  
-	/* set up the driverfs linkage to our parent device */
+	/* set up the sysfs linkage to our parent device */
 	ali1535_adapter.dev.parent = &dev->dev;
  
 	snprintf(ali1535_adapter.name, I2C_NAME_SIZE, 
@@ -489,7 +489,7 @@
 		return -ENODEV;
 	}
  
-	/* set up the driverfs linkage to our parent device */
+	/* set up the sysfs linkage to our parent device */
 	ali15x3_adapter.dev.parent = &dev->dev;
  
 	snprintf(ali15x3_adapter.name, I2C_NAME_SIZE,
@@ -374,7 +374,7 @@
 	dev_dbg(&pdev->dev, "SMBREV = 0x%X\n", temp);
 	dev_dbg(&pdev->dev, "AMD756_smba = 0x%X\n", amd756_ioport);
  
-	/* set up the driverfs linkage to our parent device */
+	/* set up the sysfs linkage to our parent device */
 	amd756_smbus.dev.parent = &pdev->dev;
  
 	sprintf(amd756_smbus.name, "SMBus %s adapter at %04x",
@@ -371,7 +371,7 @@
 	smbus->adapter.algo = &smbus_algorithm;
 	smbus->adapter.algo_data = smbus;
  
-	/* set up the driverfs linkage to our parent device */
+	/* set up the sysfs linkage to our parent device */
 	smbus->adapter.dev.parent = &dev->dev;
  
 	pci_write_config_dword(smbus->dev, AMD_PCI_MISC, 0);
@@ -522,7 +522,7 @@
 	else
 		dev_dbg(&dev->dev, "SMBus using PCI Interrupt\n");
  
-	/* set up the driverfs linkage to our parent device */
+	/* set up the sysfs linkage to our parent device */
 	i801_adapter.dev.parent = &dev->dev;
  
 	snprintf(i801_adapter.name, I2C_NAME_SIZE,
@@ -425,7 +425,7 @@
 	if (retval)
 		return retval;
  
-	/* set up the driverfs linkage to our parent device */
+	/* set up the sysfs linkage to our parent device */
 	piix4_adapter.dev.parent = &dev->dev;
  
 	snprintf(piix4_adapter.name, I2C_NAME_SIZE,
@@ -384,7 +384,7 @@
 		return -ENODEV;
 	}
  
-	/* set up the driverfs linkage to our parent device */
+	/* set up the sysfs linkage to our parent device */
 	sis5595_adapter.dev.parent = &dev->dev;
  
 	sprintf(sis5595_adapter.name, "SMBus SIS5595 adapter at %04x",
@@ -477,7 +477,7 @@
 		return -ENODEV;
 	}
  
-	/* set up the driverfs linkage to our parent device */
+	/* set up the sysfs linkage to our parent device */
 	sis630_adapter.dev.parent = &dev->dev;
  
 	sprintf(sis630_adapter.name, "SMBus SIS630 adapter at %04x",
@@ -297,7 +297,7 @@
 		return -EINVAL;
 	}
  
-	/* set up the driverfs linkage to our parent device */
+	/* set up the sysfs linkage to our parent device */
 	sis96x_adapter.dev.parent = &dev->dev;
  
 	snprintf(sis96x_adapter.name, I2C_NAME_SIZE,
@@ -138,7 +138,7 @@
 	outb(inb(I2C_DIR) & ~(I2C_SDA | I2C_SCL), I2C_DIR);
 	outb(inb(I2C_OUT) & ~(I2C_SDA | I2C_SCL), I2C_OUT);
  
-	/* set up the driverfs linkage to our parent device */
+	/* set up the sysfs linkage to our parent device */
 	vt586b_adapter.dev.parent = &dev->dev;
  
 	res = i2c_bit_add_bus(&vt586b_adapter);
@@ -5574,14 +5574,14 @@
  
 static DRIVER_ATTR(version, S_IRUGO, osst_version_show, NULL);
  
-static int osst_create_driverfs_files(struct device_driver *driverfs)
+static int osst_create_sysfs_files(struct device_driver *sysfs)
 {
-	return driver_create_file(driverfs, &driver_attr_version);
+	return driver_create_file(sysfs, &driver_attr_version);
 }
  
-static void osst_remove_driverfs_files(struct device_driver *driverfs)
+static void osst_remove_sysfs_files(struct device_driver *sysfs)
 {
-	driver_remove_file(driverfs, &driver_attr_version);
+	driver_remove_file(sysfs, &driver_attr_version);
 }
  
 /*
@@ -5953,7 +5953,7 @@
 	if (err)
 		goto err_out_chrdev;
  
-	err = osst_create_driverfs_files(&osst_template.gendrv);
+	err = osst_create_sysfs_files(&osst_template.gendrv);
 	if (err)
 		goto err_out_scsidrv;
  
@@ -5973,7 +5973,7 @@
 	int i;
 	struct osst_tape * STp;
  
-	osst_remove_driverfs_files(&osst_template.gendrv);
+	osst_remove_sysfs_files(&osst_template.gendrv);
 	scsi_unregister_driver(&osst_template.gendrv);
 	unregister_chrdev(OSST_MAJOR, "osst");
 	osst_sysfs_cleanup();
@@ -54,7 +54,7 @@
 #define SCSI_TIMEOUT (2*HZ)
  
 /*
- * Prefix values for the SCSI id's (stored in driverfs name field)
+ * Prefix values for the SCSI id's (stored in sysfs name field)
  */
 #define SCSI_UID_SER_NUM 'S'
 #define SCSI_UID_UNKNOWN 'Z'
@@ -195,8 +195,8 @@
 static int st_probe(struct device *);
 static int st_remove(struct device *);
  
-static int do_create_driverfs_files(void);
-static void do_remove_driverfs_files(void);
+static int do_create_sysfs_files(void);
+static void do_remove_sysfs_files(void);
 static int do_create_class_files(struct scsi_tape *, int, int);
  
 static struct scsi_driver st_template = {
@@ -4193,7 +4193,7 @@
 	if (err)
 		goto err_chrdev;
  
-	err = do_create_driverfs_files();
+	err = do_create_sysfs_files();
 	if (err)
 		goto err_scsidrv;
  
@@ -4211,7 +4211,7 @@
  
 static void __exit exit_st(void)
 {
-	do_remove_driverfs_files();
+	do_remove_sysfs_files();
 	scsi_unregister_driver(&st_template.gendrv);
 	unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0),
 				 ST_MAX_TAPE_ENTRIES);
  
  
  
  
  
  
  
  
  
  
  
@@ -4249,43 +4249,43 @@
 }
 static DRIVER_ATTR(version, S_IRUGO, st_version_show, NULL);
  
-static int do_create_driverfs_files(void)
+static int do_create_sysfs_files(void)
 {
-	struct device_driver *driverfs = &st_template.gendrv;
+	struct device_driver *sysfs = &st_template.gendrv;
 	int err;
  
-	err = driver_create_file(driverfs, &driver_attr_try_direct_io);
+	err = driver_create_file(sysfs, &driver_attr_try_direct_io);
 	if (err)
 		return err;
-	err = driver_create_file(driverfs, &driver_attr_fixed_buffer_size);
+	err = driver_create_file(sysfs, &driver_attr_fixed_buffer_size);
 	if (err)
 		goto err_try_direct_io;
-	err = driver_create_file(driverfs, &driver_attr_max_sg_segs);
+	err = driver_create_file(sysfs, &driver_attr_max_sg_segs);
 	if (err)
 		goto err_attr_fixed_buf;
-	err = driver_create_file(driverfs, &driver_attr_version);
+	err = driver_create_file(sysfs, &driver_attr_version);
 	if (err)
 		goto err_attr_max_sg;
  
 	return 0;
  
 err_attr_max_sg:
-	driver_remove_file(driverfs, &driver_attr_max_sg_segs);
+	driver_remove_file(sysfs, &driver_attr_max_sg_segs);
 err_attr_fixed_buf:
-	driver_remove_file(driverfs, &driver_attr_fixed_buffer_size);
+	driver_remove_file(sysfs, &driver_attr_fixed_buffer_size);
 err_try_direct_io:
-	driver_remove_file(driverfs, &driver_attr_try_direct_io);
+	driver_remove_file(sysfs, &driver_attr_try_direct_io);
 	return err;
 }
  
-static void do_remove_driverfs_files(void)
+static void do_remove_sysfs_files(void)
 {
-	struct device_driver *driverfs = &st_template.gendrv;
+	struct device_driver *sysfs = &st_template.gendrv;
  
-	driver_remove_file(driverfs, &driver_attr_version);
-	driver_remove_file(driverfs, &driver_attr_max_sg_segs);
-	driver_remove_file(driverfs, &driver_attr_fixed_buffer_size);
-	driver_remove_file(driverfs, &driver_attr_try_direct_io);
+	driver_remove_file(sysfs, &driver_attr_version);
+	driver_remove_file(sysfs, &driver_attr_max_sg_segs);
+	driver_remove_file(sysfs, &driver_attr_fixed_buffer_size);
+	driver_remove_file(sysfs, &driver_attr_try_direct_io);
 }
  
  
@@ -322,7 +322,7 @@
  
 #else
  
-/* troubleshooting help: expose state in driverfs */
+/* troubleshooting help: expose state in sysfs */
  
 #define speed_char(info1) ({ char tmp; \
 		switch (info1 & (3 << 12)) { \
@@ -440,7 +440,7 @@
 };
  
 /*
- * Module (and driverfs) parameters.
+ * Module (and sysfs) parameters.
  */
  
 #define param_set_min_max(name, type, which_strtol, min, max)		\
@@ -101,7 +101,7 @@
 #define BUS_NOTIFY_UNBIND_DRIVER	0x00000004 /* driver about to be
 						      unbound */
  
-/* driverfs interface for exporting bus attributes */
+/* sysfs interface for exporting bus attributes */
  
 struct bus_attribute {
 	struct attribute	attr;
@@ -146,7 +146,7 @@
 extern struct device_driver *driver_find(const char *name, struct bus_type *bus);
 extern int driver_probe_done(void);
  
-/* driverfs interface for exporting driver attributes */
+/* sysfs interface for exporting driver attributes */
  
 struct driver_attribute {
 	struct attribute	attr;
@@ -59,7 +59,7 @@
 };
  
 /* This is the fundamental function for registering boot/module
-   parameters.  perm sets the visibility in driverfs: 000 means it's
+   parameters.  perm sets the visibility in sysfs: 000 means it's
    not there, read bits mean it's readable, write bits mean it's
    writable. */
 #define __module_param_call(prefix, name, set, get, arg, perm)		\
1	1	/*
2		- * arch/i386/kernel/topology.c - Populate driverfs with topology information
	2	+ * arch/i386/kernel/topology.c - Populate sysfs with topology information
3	3	*
4	4	* Written by: Matthew Dobson, IBM Corporation
5	5	* Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL
...	...	@@ -63,7 +63,7 @@
63	63	};
64	64
65	65
66		-static int __init init_driverfs(void)
	66	+static int __init init_sysfs(void)
67	67	{
68	68	int error;
69	69	if (!(error = sysdev_class_register(&oprofile_sysclass)))
70	70
...	...	@@ -72,15 +72,15 @@
72	72	}
73	73
74	74
75		-static void exit_driverfs(void)
	75	+static void exit_sysfs(void)
76	76	{
77	77	sysdev_unregister(&device_oprofile);
78	78	sysdev_class_unregister(&oprofile_sysclass);
79	79	}
80	80
81	81	#else
82		-#define init_driverfs() do { } while (0)
83		-#define exit_driverfs() do { } while (0)
	82	+#define init_sysfs() do { } while (0)
	83	+#define exit_sysfs() do { } while (0)
84	84	#endif /* CONFIG_PM */
85	85
86	86	static int profile_exceptions_notify(struct notifier_block *self,
...	...	@@ -385,7 +385,7 @@
385	385	return 1;
386	386	}
387	387
388		-/* in order to get driverfs right */
	388	+/* in order to get sysfs right */
389	389	static int using_nmi;
390	390
391	391	int __init op_nmi_init(struct oprofile_operations *ops)
...	...	@@ -440,7 +440,7 @@
440	440	return -ENODEV;
441	441	}
442	442
443		- init_driverfs();
	443	+ init_sysfs();
444	444	using_nmi = 1;
445	445	ops->create_files = nmi_create_files;
446	446	ops->setup = nmi_setup;
...	...	@@ -456,6 +456,6 @@
456	456	void op_nmi_exit(void)
457	457	{
458	458	if (using_nmi)
459		- exit_driverfs();
	459	+ exit_sysfs();
460	460	}
1	1	/*
2		- * arch/parisc/kernel/topology.c - Populate driverfs with topology information
	2	+ * arch/parisc/kernel/topology.c - Populate sysfs with topology information
3	3	*
4	4	* This program is free software; you can redistribute it and/or modify
5	5	* it under the terms of the GNU General Public License as published by
...	...	@@ -418,7 +418,7 @@
418	418	set_kset_name("timer"),
419	419	};
420	420
421		-/* XXX this driverfs stuff should probably go elsewhere later -john */
	421	+/* XXX this sysfs stuff should probably go elsewhere later -john */
422	422	static struct sys_device device_timer = {
423	423	.id = 0,
424	424	.cls = &timer_sysclass,
...	...	@@ -103,7 +103,7 @@
103	103	#endif
104	104
105	105	/*
106		- * register_cpu - Setup a driverfs device for a CPU.
	106	+ * register_cpu - Setup a sysfs device for a CPU.
107	107	* @cpu - cpu->hotpluggable field set to 1 will generate a control file in
108	108	* sysfs for this CPU.
109	109	* @num - CPU number to use when creating the device.
...	...	@@ -133,7 +133,7 @@
133	133
134	134
135	135	/*
136		- * register_node - Setup a driverfs device for a node.
	136	+ * register_node - Setup a sysfs device for a node.
137	137	* @num - Node number to use when creating the device.
138	138	*
139	139	* Initialize and register the node device.
...	...	@@ -494,7 +494,7 @@
494	494	return -ENODEV;
495	495	}
496	496
497		- /* set up the driverfs linkage to our parent device */
	497	+ /* set up the sysfs linkage to our parent device */
498	498	ali1535_adapter.dev.parent = &dev->dev;
499	499
500	500	snprintf(ali1535_adapter.name, I2C_NAME_SIZE,
...	...	@@ -489,7 +489,7 @@
489	489	return -ENODEV;
490	490	}
491	491
492		- /* set up the driverfs linkage to our parent device */
	492	+ /* set up the sysfs linkage to our parent device */
493	493	ali15x3_adapter.dev.parent = &dev->dev;
494	494
495	495	snprintf(ali15x3_adapter.name, I2C_NAME_SIZE,
...	...	@@ -374,7 +374,7 @@
374	374	dev_dbg(&pdev->dev, "SMBREV = 0x%X\n", temp);
375	375	dev_dbg(&pdev->dev, "AMD756_smba = 0x%X\n", amd756_ioport);
376	376
377		- /* set up the driverfs linkage to our parent device */
	377	+ /* set up the sysfs linkage to our parent device */
378	378	amd756_smbus.dev.parent = &pdev->dev;
379	379
380	380	sprintf(amd756_smbus.name, "SMBus %s adapter at %04x",
...	...	@@ -371,7 +371,7 @@
371	371	smbus->adapter.algo = &smbus_algorithm;
372	372	smbus->adapter.algo_data = smbus;
373	373
374		- /* set up the driverfs linkage to our parent device */
	374	+ /* set up the sysfs linkage to our parent device */
375	375	smbus->adapter.dev.parent = &dev->dev;
376	376
377	377	pci_write_config_dword(smbus->dev, AMD_PCI_MISC, 0);