UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Robert P. J. Day 2007-02-17 19:13:42 +01:00 committed by Adrian Bunk
parent ca820181fc
commit 405ae7d381
23 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/i386/kernel/topology.c
View File

@ -1,5 +1,5 @@
/*
* 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

14
arch/i386/oprofile/nmi_int.c
View File

@ -63,7 +63,7 @@ static struct sys_device device_oprofile = {
};
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 int __init init_driverfs(void)
}
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 @@ static int __init ppro_init(char ** cpu_type)
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 @@ int __init op_nmi_init(struct oprofile_operations *ops)
return -ENODEV;
}
init_driverfs();
init_sysfs();
using_nmi = 1;
ops->create_files = nmi_create_files;
ops->setup = nmi_setup;
@ -456,5 +456,5 @@ int __init op_nmi_init(struct oprofile_operations *ops)
void op_nmi_exit(void)
{
if (using_nmi)
exit_driverfs();
exit_sysfs();
}

2
arch/parisc/kernel/topology.c
View File

@ -1,5 +1,5 @@
/*
* 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

2
arch/x86_64/kernel/time.c
View File

@ -418,7 +418,7 @@ static struct sysdev_class timer_sysclass = {
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,

2
drivers/base/cpu.c
View File

@ -103,7 +103,7 @@ static SYSDEV_ATTR(crash_notes, 0400, show_crash_notes, NULL);
#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.

2
drivers/base/node.c
View File

@ -133,7 +133,7 @@ static SYSDEV_ATTR(distance, S_IRUGO, node_read_distance, NULL);
/*
* 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.

2
drivers/i2c/busses/i2c-ali1535.c
View File

@ -494,7 +494,7 @@ static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_
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,

2
drivers/i2c/busses/i2c-ali15x3.c
View File

@ -489,7 +489,7 @@ static int __devinit ali15x3_probe(struct pci_dev *dev, const struct pci_device_
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,

2
drivers/i2c/busses/i2c-amd756.c
View File

@ -374,7 +374,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev,
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",

2
drivers/i2c/busses/i2c-amd8111.c
View File

@ -371,7 +371,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev,
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);

2
drivers/i2c/busses/i2c-i801.c
View File

@ -522,7 +522,7 @@ static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id
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,

2
drivers/i2c/busses/i2c-piix4.c
View File

@ -425,7 +425,7 @@ static int __devinit piix4_probe(struct pci_dev *dev,
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,

2
drivers/i2c/busses/i2c-sis5595.c
View File

@ -384,7 +384,7 @@ static int __devinit sis5595_probe(struct pci_dev *dev, const struct pci_device_
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",

2
drivers/i2c/busses/i2c-sis630.c
View File

@ -477,7 +477,7 @@ static int __devinit sis630_probe(struct pci_dev *dev, const struct pci_device_i
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",

2
drivers/i2c/busses/i2c-sis96x.c
View File

@ -297,7 +297,7 @@ static int __devinit sis96x_probe(struct pci_dev *dev,
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,

2
drivers/i2c/busses/i2c-via.c
View File

@ -138,7 +138,7 @@ static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_i
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);

12
drivers/scsi/osst.c
View File

@ -5574,14 +5574,14 @@ static ssize_t osst_version_show(struct device_driver *ddd, char *buf)
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 @@ static int __init init_osst(void)
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 @@ static void __exit exit_osst (void)
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();

2
drivers/scsi/scsi_scan.c
View File

@ -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'

38
drivers/scsi/st.c
View File

@ -195,8 +195,8 @@ static int sgl_unmap_user_pages(struct scatterlist *, const unsigned int, int);
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 @@ static int __init init_st(void)
if (err)
goto err_chrdev;
err = do_create_driverfs_files();
err = do_create_sysfs_files();
if (err)
goto err_scsidrv;
@ -4211,7 +4211,7 @@ err_class:
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 ssize_t st_version_show(struct device_driver *ddd, char *buf)
}
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);
}

2
drivers/usb/host/ehci-dbg.c
View File

@ -322,7 +322,7 @@ static inline void remove_debug_files (struct ehci_hcd *bus) { }
#else
/* troubleshooting help: expose state in driverfs */
/* troubleshooting help: expose state in sysfs */
#define speed_char(info1) ({ char tmp; \
switch (info1 & (3 << 12)) { \

2
fs/lockd/svc.c
View File

@ -440,7 +440,7 @@ static ctl_table nlm_sysctl_root[] = {
};
/*
* Module (and driverfs) parameters.
* Module (and sysfs) parameters.
*/
#define param_set_min_max(name, type, which_strtol, min, max) \

4
include/linux/device.h
View File

@ -101,7 +101,7 @@ extern int bus_unregister_notifier(struct bus_type *bus,
#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 void put_driver(struct device_driver * drv);
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;

2
include/linux/moduleparam.h
View File

@ -59,7 +59,7 @@ struct kparam_array
};
/* 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) \