Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] devfs: Remove devfs_mk_cdev() function from the kernel tree

Browse source 
Removes the devfs_mk_cdev() function and all callers of it.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2005-06-20 21:15:16 -07:00
parent 1a715c5cf9
commit 7c69ef7974
35 changed files with 8 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sparc64/solaris/socksys.c
View file

@ -190,8 +190,6 @@ init_socksys(void)
return ret; return ret;
} }
devfs_mk_cdev(MKDEV(30, 0), S_IFCHR|S_IRUSR|S_IWUSR, "socksys");
file = fcheck(ret); file = fcheck(ret);
/* N.B. Is this valid? Suppose the f_ops are in a module ... */ /* N.B. Is this valid? Suppose the f_ops are in a module ... */
socksys_file_ops = *file->f_op; socksys_file_ops = *file->f_op;

4
drivers/block/acsi_slm.c
View file

@ -1005,10 +1005,6 @@ int slm_init( void )
BufferP = SLMBuffer; BufferP = SLMBuffer;
SLMState = IDLE; SLMState = IDLE;
for (i = 0; i < MAX_SLM; i++) {
devfs_mk_cdev(MKDEV(ACSI_MAJOR, i),
S_IFCHR|S_IRUSR|S_IWUSR, "slm/%d", i);
}
return 0; return 0;
} }

11
drivers/block/paride/pg.c
View file

@ -676,22 +676,13 @@ static int __init pg_init(void)
} }
for (unit = 0; unit < PG_UNITS; unit++) { for (unit = 0; unit < PG_UNITS; unit++) {
struct pg *dev = &devices[unit]; struct pg *dev = &devices[unit];
if (dev->present) { if (dev->present)
class_device_create(pg_class, NULL, MKDEV(major, unit), class_device_create(pg_class, NULL, MKDEV(major, unit),
NULL, "pg%u", unit); NULL, "pg%u", unit);
err = devfs_mk_cdev(MKDEV(major, unit),
S_IFCHR | S_IRUSR | S_IWUSR, "pg/%u",
unit);
if (err)
goto out_class;
}
} }
err = 0; err = 0;
goto out; goto out;
out_class:
class_device_destroy(pg_class, MKDEV(major, unit));
class_destroy(pg_class);
out_chrdev: out_chrdev:
unregister_chrdev(major, "pg"); unregister_chrdev(major, "pg");
out: out:

16
drivers/block/paride/pt.c
View file

@ -975,27 +975,11 @@ static int __init pt_init(void)
if (pt[unit].present) { if (pt[unit].present) {
class_device_create(pt_class, NULL, MKDEV(major, unit), class_device_create(pt_class, NULL, MKDEV(major, unit),
NULL, "pt%d", unit); NULL, "pt%d", unit);
err = devfs_mk_cdev(MKDEV(major, unit),
S_IFCHR | S_IRUSR | S_IWUSR,
"pt/%d", unit);
if (err) {
class_device_destroy(pt_class, MKDEV(major, unit));
goto out_class;
}
class_device_create(pt_class, NULL, MKDEV(major, unit + 128), class_device_create(pt_class, NULL, MKDEV(major, unit + 128),
NULL, "pt%dn", unit); NULL, "pt%dn", unit);
err = devfs_mk_cdev(MKDEV(major, unit + 128),
S_IFCHR | S_IRUSR | S_IWUSR,
"pt/%dn", unit);
if (err) {
class_device_destroy(pt_class, MKDEV(major, unit + 128));
goto out_class;
}
} }
goto out; goto out;
out_class:
class_destroy(pt_class);
out_chrdev: out_chrdev:
unregister_chrdev(major, "pt"); unregister_chrdev(major, "pt");
out: out:

8
drivers/char/dsp56k.c
View file

@ -518,17 +518,9 @@ static int __init dsp56k_init_driver(void)
} }
class_device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k"); class_device_create(dsp56k_class, NULL, MKDEV(DSP56K_MAJOR, 0), NULL, "dsp56k");
err = devfs_mk_cdev(MKDEV(DSP56K_MAJOR, 0),
S_IFCHR | S_IRUSR | S_IWUSR, "dsp56k");
if(err)
goto out_class;
printk(banner); printk(banner);
goto out; goto out;
out_class:
class_device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0));
class_destroy(dsp56k_class);
out_chrdev: out_chrdev:
unregister_chrdev(DSP56K_MAJOR, "dsp56k"); unregister_chrdev(DSP56K_MAJOR, "dsp56k");
out: out:

3
drivers/char/dtlk.c
View file

@ -337,9 +337,6 @@ static int __init dtlk_init(void)
if (dtlk_dev_probe() == 0) if (dtlk_dev_probe() == 0)
printk(", MAJOR %d\n", dtlk_major); printk(", MAJOR %d\n", dtlk_major);
devfs_mk_cdev(MKDEV(dtlk_major, DTLK_MINOR),
S_IFCHR | S_IRUSR | S_IWUSR, "dtlk");
init_timer(&dtlk_timer); init_timer(&dtlk_timer);
dtlk_timer.function = dtlk_timer_tick; dtlk_timer.function = dtlk_timer_tick;
init_waitqueue_head(&dtlk_process_list); init_waitqueue_head(&dtlk_process_list);

18
drivers/char/ftape/zftape/zftape-init.c
View file

@ -332,29 +332,11 @@ KERN_INFO
zft_class = class_create(THIS_MODULE, "zft"); zft_class = class_create(THIS_MODULE, "zft");
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i), NULL, "qft%i", i); class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i), NULL, "qft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i),
S_IFCHR | S_IRUSR | S_IWUSR,
"qft%i", i);
class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 4), NULL, "nqft%i", i); class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 4), NULL, "nqft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 4),
S_IFCHR | S_IRUSR | S_IWUSR,
"nqft%i", i);
class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 16), NULL, "zqft%i", i); class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 16), NULL, "zqft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 16),
S_IFCHR | S_IRUSR | S_IWUSR,
"zqft%i", i);
class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 20), NULL, "nzqft%i", i); class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 20), NULL, "nzqft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 20),
S_IFCHR | S_IRUSR | S_IWUSR,
"nzqft%i", i);
class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 32), NULL, "rawqft%i", i); class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 32), NULL, "rawqft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 32),
S_IFCHR | S_IRUSR | S_IWUSR,
"rawqft%i", i);
class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 36), NULL, "nrawrawqft%i", i); class_device_create(zft_class, NULL, MKDEV(QIC117_TAPE_MAJOR, i + 36), NULL, "nrawrawqft%i", i);
devfs_mk_cdev(MKDEV(QIC117_TAPE_MAJOR, i + 36),
S_IFCHR | S_IRUSR | S_IWUSR,
"nrawqft%i", i);
} }
#ifdef CONFIG_ZFT_COMPRESSOR #ifdef CONFIG_ZFT_COMPRESSOR

17
drivers/char/ip2/ip2main.c
View file

@ -724,26 +724,9 @@ ip2_loadmain(int *iop, int *irqp, unsigned char *firmware, int firmsize)
class_device_create(ip2_class, NULL, class_device_create(ip2_class, NULL,
MKDEV(IP2_IPL_MAJOR, 4 * i), MKDEV(IP2_IPL_MAJOR, 4 * i),
NULL, "ipl%d", i); NULL, "ipl%d", i);
err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i),
S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
"ip2/ipl%d", i);
if (err) {
class_device_destroy(ip2_class,
MKDEV(IP2_IPL_MAJOR, 4 * i));
goto out_class;
}
class_device_create(ip2_class, NULL, class_device_create(ip2_class, NULL,
MKDEV(IP2_IPL_MAJOR, 4 * i + 1), MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
NULL, "stat%d", i); NULL, "stat%d", i);
err = devfs_mk_cdev(MKDEV(IP2_IPL_MAJOR, 4 * i + 1),
S_IRUSR | S_IWUSR | S_IRGRP | S_IFCHR,
"ip2/stat%d", i);
if (err) {
class_device_destroy(ip2_class,
MKDEV(IP2_IPL_MAJOR, 4 * i + 1));
goto out_class;
}
for ( box = 0; box < ABS_MAX_BOXES; ++box ) for ( box = 0; box < ABS_MAX_BOXES; ++box )
{ {

3
drivers/char/ipmi/ipmi_devintf.c
View file

@ -804,9 +804,6 @@ static void ipmi_new_smi(int if_num, struct device *device)
dev_t dev = MKDEV(ipmi_major, if_num); dev_t dev = MKDEV(ipmi_major, if_num);
struct ipmi_reg_list *entry; struct ipmi_reg_list *entry;
devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR,
"ipmidev/%d", if_num);
entry = kmalloc(sizeof(*entry), GFP_KERNEL); entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry) { if (!entry) {
printk(KERN_ERR "ipmi_devintf: Unable to create the" printk(KERN_ERR "ipmi_devintf: Unable to create the"

6
drivers/char/istallion.c
View file

@ -5214,14 +5214,10 @@ int __init stli_init(void)
"device\n"); "device\n");
istallion_class = class_create(THIS_MODULE, "staliomem"); istallion_class = class_create(THIS_MODULE, "staliomem");
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
S_IFCHR | S_IRUSR | S_IWUSR,
"staliomem/%d", i);
class_device_create(istallion_class, NULL, class_device_create(istallion_class, NULL,
MKDEV(STL_SIOMEMMAJOR, i), MKDEV(STL_SIOMEMMAJOR, i),
NULL, "staliomem%d", i); NULL, "staliomem%d", i);
}
/* /*
* Set up the tty driver structure and register us as a driver. * Set up the tty driver structure and register us as a driver.

2
drivers/char/lp.c
View file

@ -807,8 +807,6 @@ static int lp_register(int nr, struct parport *port)
class_device_create(lp_class, NULL, MKDEV(LP_MAJOR, nr), NULL, class_device_create(lp_class, NULL, MKDEV(LP_MAJOR, nr), NULL,
"lp%d", nr); "lp%d", nr);
devfs_mk_cdev(MKDEV(LP_MAJOR, nr), S_IFCHR | S_IRUGO | S_IWUGO,
"printers/%d", nr);
printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port->name, printk(KERN_INFO "lp%d: using %s (%s).\n", nr, port->name,
(port->irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven"); (port->irq == PARPORT_IRQ_NONE)?"polling":"interrupt-driven");

5
drivers/char/mem.c
View file

@ -941,13 +941,10 @@ static int __init chr_dev_init(void)
printk("unable to get major %d for memory devs\n", MEM_MAJOR); printk("unable to get major %d for memory devs\n", MEM_MAJOR);
mem_class = class_create(THIS_MODULE, "mem"); mem_class = class_create(THIS_MODULE, "mem");
for (i = 0; i < ARRAY_SIZE(devlist); i++) { for (i = 0; i < ARRAY_SIZE(devlist); i++)
class_device_create(mem_class, NULL, class_device_create(mem_class, NULL,
MKDEV(MEM_MAJOR, devlist[i].minor), MKDEV(MEM_MAJOR, devlist[i].minor),
NULL, devlist[i].name); NULL, devlist[i].name);
devfs_mk_cdev(MKDEV(MEM_MAJOR, devlist[i].minor),
S_IFCHR | devlist[i].mode, devlist[i].name);
}
return 0; return 0;
} }

9
drivers/char/misc.c
View file

@ -204,7 +204,7 @@ int misc_register(struct miscdevice * misc)
{ {
struct miscdevice *c; struct miscdevice *c;
dev_t dev; dev_t dev;
int err; int err = 0;
down(&misc_sem); down(&misc_sem);
list_for_each_entry(c, &misc_list, list) { list_for_each_entry(c, &misc_list, list) {
@ -241,13 +241,6 @@ int misc_register(struct miscdevice * misc)
goto out; goto out;
} }
err = devfs_mk_cdev(dev, S_IFCHR|S_IRUSR|S_IWUSR|S_IRGRP,
misc->devfs_name);
if (err) {
class_device_destroy(misc_class, dev);
goto out;
}
/* /*
* Add it to the front, so that later devices can "override" * Add it to the front, so that later devices can "override"
* earlier defaults * earlier defaults

4
drivers/char/ppdev.c
View file

@ -782,10 +782,6 @@ static int __init ppdev_init (void)
err = PTR_ERR(ppdev_class); err = PTR_ERR(ppdev_class);
goto out_chrdev; goto out_chrdev;
} }
for (i = 0; i < PARPORT_MAX; i++) {
devfs_mk_cdev(MKDEV(PP_MAJOR, i),
S_IFCHR | S_IRUGO | S_IWUGO, "parports/%d", i);
}
if (parport_register_driver(&pp_driver)) { if (parport_register_driver(&pp_driver)) {
printk (KERN_WARNING CHRDEV ": unable to register with parport\n"); printk (KERN_WARNING CHRDEV ": unable to register with parport\n");
goto out_class; goto out_class;

8
drivers/char/raw.c
View file

@ -288,7 +288,6 @@ static struct cdev raw_cdev = {
static int __init raw_init(void) static int __init raw_init(void)
{ {
int i;
dev_t dev = MKDEV(RAW_MAJOR, 0); dev_t dev = MKDEV(RAW_MAJOR, 0);
if (register_chrdev_region(dev, MAX_RAW_MINORS, "raw")) if (register_chrdev_region(dev, MAX_RAW_MINORS, "raw"))
@ -310,13 +309,6 @@ static int __init raw_init(void)
} }
class_device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl"); class_device_create(raw_class, NULL, MKDEV(RAW_MAJOR, 0), NULL, "rawctl");
devfs_mk_cdev(MKDEV(RAW_MAJOR, 0),
S_IFCHR | S_IRUGO | S_IWUGO,
"raw/rawctl");
for (i = 1; i < MAX_RAW_MINORS; i++)
devfs_mk_cdev(MKDEV(RAW_MAJOR, i),
S_IFCHR | S_IRUGO | S_IWUGO,
"raw/raw%d", i);
return 0; return 0;
error: error:

6
drivers/char/stallion.c
View file

@ -3071,14 +3071,10 @@ static int __init stl_init(void)
printk("STALLION: failed to register serial board device\n"); printk("STALLION: failed to register serial board device\n");
stallion_class = class_create(THIS_MODULE, "staliomem"); stallion_class = class_create(THIS_MODULE, "staliomem");
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++)
devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
S_IFCHR|S_IRUSR|S_IWUSR,
"staliomem/%d", i);
class_device_create(stallion_class, NULL, class_device_create(stallion_class, NULL,
MKDEV(STL_SIOMEMMAJOR, i), NULL, MKDEV(STL_SIOMEMMAJOR, i), NULL,
"staliomem%d", i); "staliomem%d", i);
}
stl_serial->owner = THIS_MODULE; stl_serial->owner = THIS_MODULE;
stl_serial->driver_name = stl_drvname; stl_serial->driver_name = stl_drvname;

10
drivers/char/tipar.c
View file

@ -443,12 +443,6 @@ tipar_register(int nr, struct parport *port)
class_device_create(tipar_class, NULL, MKDEV(TIPAR_MAJOR, class_device_create(tipar_class, NULL, MKDEV(TIPAR_MAJOR,
TIPAR_MINOR + nr), NULL, "par%d", nr); TIPAR_MINOR + nr), NULL, "par%d", nr);
/* Use devfs, tree: /dev/ticables/par/[0..2] */
err = devfs_mk_cdev(MKDEV(TIPAR_MAJOR, TIPAR_MINOR + nr),
S_IFCHR | S_IRUGO | S_IWUGO,
"ticables/par/%d", nr);
if (err)
goto out_class;
/* Display informations */ /* Display informations */
pr_info("tipar%d: using %s (%s)\n", nr, port->name, (port->irq == pr_info("tipar%d: using %s (%s)\n", nr, port->name, (port->irq ==
@ -460,11 +454,7 @@ tipar_register(int nr, struct parport *port)
pr_info("tipar%d: link cable not found\n", nr); pr_info("tipar%d: link cable not found\n", nr);
err = 0; err = 0;
goto out;
out_class:
class_device_destroy(tipar_class, MKDEV(TIPAR_MAJOR, TIPAR_MINOR + nr));
class_destroy(tipar_class);
out: out:
return err; return err;
} }

7
drivers/char/tty_io.c
View file

@ -2979,9 +2979,6 @@ struct class_device *tty_register_device(struct tty_driver *driver,
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR,
"%s%d", driver->devfs_name, index + driver->name_base);
if (driver->type == TTY_DRIVER_TYPE_PTY) if (driver->type == TTY_DRIVER_TYPE_PTY)
pty_line_name(driver, index, name); pty_line_name(driver, index, name);
else else
@ -3241,14 +3238,12 @@ static int __init tty_init(void)
if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) || if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0) register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
panic("Couldn't register /dev/tty driver\n"); panic("Couldn't register /dev/tty driver\n");
devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 0), S_IFCHR|S_IRUGO|S_IWUGO, "tty");
class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty"); class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 0), NULL, "tty");
cdev_init(&console_cdev, &console_fops); cdev_init(&console_cdev, &console_fops);
if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) || if (cdev_add(&console_cdev, MKDEV(TTYAUX_MAJOR, 1), 1) ||
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0) register_chrdev_region(MKDEV(TTYAUX_MAJOR, 1), 1, "/dev/console") < 0)
panic("Couldn't register /dev/console driver\n"); panic("Couldn't register /dev/console driver\n");
devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 1), S_IFCHR|S_IRUSR|S_IWUSR, "console");
class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL, "console"); class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 1), NULL, "console");
#ifdef CONFIG_UNIX98_PTYS #ifdef CONFIG_UNIX98_PTYS
@ -3256,7 +3251,6 @@ static int __init tty_init(void)
if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
panic("Couldn't register /dev/ptmx driver\n"); panic("Couldn't register /dev/ptmx driver\n");
devfs_mk_cdev(MKDEV(TTYAUX_MAJOR, 2), S_IFCHR|S_IRUGO|S_IWUGO, "ptmx");
class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx"); class_device_create(tty_class, NULL, MKDEV(TTYAUX_MAJOR, 2), NULL, "ptmx");
#endif #endif
@ -3265,7 +3259,6 @@ static int __init tty_init(void)
if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) || if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
panic("Couldn't register /dev/tty0 driver\n"); panic("Couldn't register /dev/tty0 driver\n");
devfs_mk_cdev(MKDEV(TTY_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vc/0");
class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0"); class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
vty_init(); vty_init();

8
drivers/char/vc_screen.c
View file

@ -478,12 +478,6 @@ static struct class *vc_class;
void vcs_make_devfs(struct tty_struct *tty) void vcs_make_devfs(struct tty_struct *tty)
{ {
devfs_mk_cdev(MKDEV(VCS_MAJOR, tty->index + 1),
S_IFCHR|S_IRUSR|S_IWUSR,
"vcc/%u", tty->index + 1);
devfs_mk_cdev(MKDEV(VCS_MAJOR, tty->index + 129),
S_IFCHR|S_IRUSR|S_IWUSR,
"vcc/a%u", tty->index + 1);
class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1), class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 1),
NULL, "vcs%u", tty->index + 1); NULL, "vcs%u", tty->index + 1);
class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129), class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, tty->index + 129),
@ -503,8 +497,6 @@ int __init vcs_init(void)
panic("unable to get major %d for vcs device", VCS_MAJOR); panic("unable to get major %d for vcs device", VCS_MAJOR);
vc_class = class_create(THIS_MODULE, "vc"); vc_class = class_create(THIS_MODULE, "vc");
devfs_mk_cdev(MKDEV(VCS_MAJOR, 0), S_IFCHR|S_IRUSR|S_IWUSR, "vcc/0");
devfs_mk_cdev(MKDEV(VCS_MAJOR, 128), S_IFCHR|S_IRUSR|S_IWUSR, "vcc/a0");
class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs"); class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 0), NULL, "vcs");
class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa"); class_device_create(vc_class, NULL, MKDEV(VCS_MAJOR, 128), NULL, "vcsa");
return 0; return 0;

4
drivers/char/viotape.c
View file

@ -958,10 +958,6 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
"iseries!vt%d", i); "iseries!vt%d", i);
class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80), class_device_create(tape_class, NULL, MKDEV(VIOTAPE_MAJOR, i | 0x80),
NULL, "iseries!nvt%d", i); NULL, "iseries!nvt%d", i);
devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i), S_IFCHR | S_IRUSR | S_IWUSR,
"iseries/vt%d", i);
devfs_mk_cdev(MKDEV(VIOTAPE_MAJOR, i | 0x80),
S_IFCHR | S_IRUSR | S_IWUSR, "iseries/nvt%d", i);
sprintf(tapename, "iseries/vt%d", i); sprintf(tapename, "iseries/vt%d", i);
printk(VIOTAPE_KERN_INFO "tape %s is iSeries " printk(VIOTAPE_KERN_INFO "tape %s is iSeries "
"resource %10.10s type %4.4s, model %3.3s\n", "resource %10.10s type %4.4s, model %3.3s\n",

2
drivers/isdn/capi/capi.c
View file

@ -1516,8 +1516,6 @@ static int __init capi_init(void)
} }
class_device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi"); class_device_create(capi_class, NULL, MKDEV(capi_major, 0), NULL, "capi");
devfs_mk_cdev(MKDEV(capi_major, 0), S_IFCHR | S_IRUSR | S_IWUSR,
"isdn/capi20");
#ifdef CONFIG_ISDN_CAPI_MIDDLEWARE #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE
if (capinc_tty_init() < 0) { if (capinc_tty_init() < 0) {

1
drivers/isdn/hardware/eicon/divamnt.c
View file

@ -190,7 +190,6 @@ static int DIVA_INIT_FUNCTION divas_maint_register_chrdev(void)
DRIVERLNAME); DRIVERLNAME);
return (0); return (0);
} }
devfs_mk_cdev(MKDEV(major, 0), S_IFCHR|S_IRUSR|S_IWUSR, DEVNAME);
return (1); return (1);
} }

1
drivers/isdn/hardware/eicon/divasi.c
View file

@ -157,7 +157,6 @@ static int DIVA_INIT_FUNCTION divas_idi_register_chrdev(void)
DRIVERLNAME); DRIVERLNAME);
return (0); return (0);
} }
devfs_mk_cdev(MKDEV(major, 0), S_IFCHR|S_IRUSR|S_IWUSR, DEVNAME);
return (1); return (1);
} }

1
drivers/isdn/hardware/eicon/divasmain.c
View file

@ -690,7 +690,6 @@ static int DIVA_INIT_FUNCTION divas_register_chrdev(void)
DRIVERLNAME); DRIVERLNAME);
return (0); return (0);
} }
devfs_mk_cdev(MKDEV(major, 0), S_IFCHR|S_IRUSR|S_IWUSR, DEVNAME);
return (1); return (1);
} }

2
drivers/macintosh/adb.c
View file

@ -904,8 +904,6 @@ adbdev_init(void)
return; return;
} }
devfs_mk_cdev(MKDEV(ADB_MAJOR, 0), S_IFCHR | S_IRUSR | S_IWUSR, "adb");
adb_dev_class = class_create(THIS_MODULE, "adb"); adb_dev_class = class_create(THIS_MODULE, "adb");
if (IS_ERR(adb_dev_class)) if (IS_ERR(adb_dev_class))
return; return;

4
drivers/media/dvb/dvb-core/dvbdev.c
View file

@ -231,10 +231,6 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
mutex_unlock(&dvbdev_register_lock); mutex_unlock(&dvbdev_register_lock);
devfs_mk_cdev(MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
S_IFCHR | S_IRUSR | S_IWUSR,
"dvb/adapter%d/%s%d", adap->num, dnames[type], id);
class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)), class_device_create(dvb_class, NULL, MKDEV(DVB_MAJOR, nums2minor(adap->num, type, id)),
adap->device, "dvb%d.%s%d", adap->num, dnames[type], id); adap->device, "dvb%d.%s%d", adap->num, dnames[type], id);

7
drivers/media/video/videodev.c
View file

@ -1563,10 +1563,6 @@ int video_register_device(struct video_device *vfd, int type, int nr)
video_device[i]=vfd; video_device[i]=vfd;
vfd->minor=i; vfd->minor=i;
mutex_unlock(&videodev_lock); mutex_unlock(&videodev_lock);
sprintf(vfd->devfs_name, "v4l/%s%d", name_base, i - base);
devfs_mk_cdev(MKDEV(VIDEO_MAJOR, vfd->minor),
S_IFCHR | S_IRUSR | S_IWUSR, vfd->devfs_name);
mutex_init(&vfd->lock); mutex_init(&vfd->lock);
/* sysfs class */ /* sysfs class */
@ -1575,7 +1571,8 @@ int video_register_device(struct video_device *vfd, int type, int nr)
vfd->class_dev.dev = vfd->dev; vfd->class_dev.dev = vfd->dev;
vfd->class_dev.class = &video_class; vfd->class_dev.class = &video_class;
vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);
strlcpy(vfd->class_dev.class_id, vfd->devfs_name + 4, BUS_ID_SIZE); sprintf(vfd->devfs_name, "%s%d", name_base, i - base);
strlcpy(vfd->class_dev.class_id, vfd->devfs_name, BUS_ID_SIZE);
class_device_register(&vfd->class_dev); class_device_register(&vfd->class_dev);
class_device_create_file(&vfd->class_dev, class_device_create_file(&vfd->class_dev,
&class_device_attr_name); &class_device_attr_name);

7
drivers/net/ppp_generic.c
View file

@ -863,10 +863,6 @@ static int __init ppp_init(void)
goto out_chrdev; goto out_chrdev;
} }
class_device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL, "ppp"); class_device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL, "ppp");
err = devfs_mk_cdev(MKDEV(PPP_MAJOR, 0),
S_IFCHR|S_IRUSR|S_IWUSR, "ppp");
if (err)
goto out_class;
} }
out: out:
@ -874,9 +870,6 @@ static int __init ppp_init(void)
printk(KERN_ERR "failed to register PPP device (%d)\n", err); printk(KERN_ERR "failed to register PPP device (%d)\n", err);
return err; return err;
out_class:
class_device_destroy(ppp_class, MKDEV(PPP_MAJOR,0));
class_destroy(ppp_class);
out_chrdev: out_chrdev:
unregister_chrdev(PPP_MAJOR, "ppp"); unregister_chrdev(PPP_MAJOR, "ppp");
goto out; goto out;

7
drivers/net/wan/cosa.c
View file

@ -401,13 +401,6 @@ static int __init cosa_init(void)
for (i=0; i<nr_cards; i++) { for (i=0; i<nr_cards; i++) {
class_device_create(cosa_class, NULL, MKDEV(cosa_major, i), class_device_create(cosa_class, NULL, MKDEV(cosa_major, i),
NULL, "cosa%d", i); NULL, "cosa%d", i);
err = devfs_mk_cdev(MKDEV(cosa_major, i),
S_IFCHR|S_IRUSR|S_IWUSR,
"cosa/%d", i);
if (err) {
class_device_destroy(cosa_class, MKDEV(cosa_major, i));
goto out_chrdev;
}
} }
err = 0; err = 0;
goto out; goto out;

4
drivers/sbus/char/bpp.c
View file

@ -1031,10 +1031,6 @@ static int __init bpp_init(void)
instances[idx].opened = 0; instances[idx].opened = 0;
probeLptPort(idx); probeLptPort(idx);
} }
for (idx = 0; idx < BPP_NO; idx++) {
devfs_mk_cdev(MKDEV(BPP_MAJOR, idx),
S_IFCHR | S_IRUSR | S_IWUSR, "bpp/%d", idx);
}
return 0; return 0;
} }

4
drivers/sbus/char/vfc_dev.c
View file

@ -164,10 +164,6 @@ int init_vfc_device(struct sbus_dev *sdev,struct vfc_dev *dev, int instance)
return -EINVAL; return -EINVAL;
if (init_vfc_hw(dev)) if (init_vfc_hw(dev))
return -EIO; return -EIO;
devfs_mk_cdev(MKDEV(VFC_MAJOR, instance),
S_IFCHR | S_IRUSR | S_IWUSR,
"vfc/%d", instance);
return 0; return 0;
} }

2
drivers/telephony/phonedev.c
View file

@ -106,8 +106,6 @@ int phone_register_device(struct phone_device *p, int unit)
if (phone_device[i] == NULL) { if (phone_device[i] == NULL) {
phone_device[i] = p; phone_device[i] = p;
p->minor = i; p->minor = i;
devfs_mk_cdev(MKDEV(PHONE_MAJOR,i),
S_IFCHR|S_IRUSR|S_IWUSR, "phone/%d", i);
mutex_unlock(&phone_lock); mutex_unlock(&phone_lock);
return 0; return 0;
} }

2
drivers/video/fbmem.c
View file

@ -1331,8 +1331,6 @@ register_framebuffer(struct fb_info *fb_info)
fb_add_videomode(&mode, &fb_info->modelist); fb_add_videomode(&mode, &fb_info->modelist);
registered_fb[i] = fb_info; registered_fb[i] = fb_info;
devfs_mk_cdev(MKDEV(FB_MAJOR, i),
S_IFCHR | S_IRUGO | S_IWUGO, "fb/%d", i);
event.info = fb_info; event.info = fb_info;
blocking_notifier_call_chain(&fb_notifier_list, blocking_notifier_call_chain(&fb_notifier_list,
FB_EVENT_FB_REGISTERED, &event); FB_EVENT_FB_REGISTERED, &event);

11
fs/coda/psdev.c
View file

@ -365,21 +365,12 @@ static int init_coda_psdev(void)
err = PTR_ERR(coda_psdev_class); err = PTR_ERR(coda_psdev_class);
goto out_chrdev; goto out_chrdev;
} }
for (i = 0; i < MAX_CODADEVS; i++) { for (i = 0; i < MAX_CODADEVS; i++)
class_device_create(coda_psdev_class, NULL, class_device_create(coda_psdev_class, NULL,
MKDEV(CODA_PSDEV_MAJOR,i), NULL, "cfs%d", i); MKDEV(CODA_PSDEV_MAJOR,i), NULL, "cfs%d", i);
err = devfs_mk_cdev(MKDEV(CODA_PSDEV_MAJOR, i),
S_IFCHR|S_IRUSR|S_IWUSR, "coda/%d", i);
if (err)
goto out_class;
}
coda_sysctl_init(); coda_sysctl_init();
goto out; goto out;
out_class:
for (i = 0; i < MAX_CODADEVS; i++)
class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i));
class_destroy(coda_psdev_class);
out_chrdev: out_chrdev:
unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); unregister_chrdev(CODA_PSDEV_MAJOR, "coda");
out: out:

4
include/linux/devfs_fs_kernel.h
View file

@ -6,10 +6,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <asm/semaphore.h> #include <asm/semaphore.h>
static inline int devfs_mk_cdev(dev_t dev, umode_t mode, const char *fmt, ...)
{
return 0;
}
static inline void devfs_remove(const char *fmt, ...) static inline void devfs_remove(const char *fmt, ...)
{ {
} }