aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2005-06-21 00:15:16 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-26 15:25:06 -0400
commit95dc112a5770dc670a1b45a3d9ee346fdd2b2697 (patch)
tree899cd99bdc928ade94ddc7b003b0de7d275cac48 /drivers/block
parent0e6c62da7cd929b0389fc4a7e41464bb738647dc (diff)
[PATCH] devfs: Remove devfs_mk_dir() function from the kernel tree
Removes the devfs_mk_dir() function and all callers of it. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/acsi_slm.c1
-rw-r--r--drivers/block/floppy.c2
-rw-r--r--drivers/block/loop.c2
-rw-r--r--drivers/block/nbd.c1
-rw-r--r--drivers/block/paride/pg.c1
-rw-r--r--drivers/block/paride/pt.c1
-rw-r--r--drivers/block/rd.c2
-rw-r--r--drivers/block/swim3.c2
-rw-r--r--drivers/block/sx8.c2
-rw-r--r--drivers/block/ub.c1
10 files changed, 0 insertions, 15 deletions
diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index 4cb9c1336287..1ecbcc3da147 100644
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -1005,7 +1005,6 @@ int slm_init( void )
1005 BufferP = SLMBuffer; 1005 BufferP = SLMBuffer;
1006 SLMState = IDLE; 1006 SLMState = IDLE;
1007 1007
1008 devfs_mk_dir("slm");
1009 for (i = 0; i < MAX_SLM; i++) { 1008 for (i = 0; i < MAX_SLM; i++) {
1010 devfs_mk_cdev(MKDEV(ACSI_MAJOR, i), 1009 devfs_mk_cdev(MKDEV(ACSI_MAJOR, i),
1011 S_IFCHR|S_IRUSR|S_IWUSR, "slm/%d", i); 1010 S_IFCHR|S_IRUSR|S_IWUSR, "slm/%d", i);
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index dff1e67b1dd4..03a4dff05f27 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4261,8 +4261,6 @@ static int __init floppy_init(void)
4261 motor_off_timer[dr].function = motor_off_callback; 4261 motor_off_timer[dr].function = motor_off_callback;
4262 } 4262 }
4263 4263
4264 devfs_mk_dir("floppy");
4265
4266 err = register_blkdev(FLOPPY_MAJOR, "fd"); 4264 err = register_blkdev(FLOPPY_MAJOR, "fd");
4267 if (err) 4265 if (err)
4268 goto out_devfs_remove; 4266 goto out_devfs_remove;
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 3c74ea729fc7..f650d20f2a17 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1277,8 +1277,6 @@ static int __init loop_init(void)
1277 goto out_mem3; 1277 goto out_mem3;
1278 } 1278 }
1279 1279
1280 devfs_mk_dir("loop");
1281
1282 for (i = 0; i < max_loop; i++) { 1280 for (i = 0; i < max_loop; i++) {
1283 struct loop_device *lo = &loop_dev[i]; 1281 struct loop_device *lo = &loop_dev[i];
1284 struct gendisk *disk = disks[i]; 1282 struct gendisk *disk = disks[i];
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 7f554f2ed079..618e258ca5d0 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -642,7 +642,6 @@ static int __init nbd_init(void)
642 printk(KERN_INFO "nbd: registered device at major %d\n", NBD_MAJOR); 642 printk(KERN_INFO "nbd: registered device at major %d\n", NBD_MAJOR);
643 dprintk(DBG_INIT, "nbd: debugflags=0x%x\n", debugflags); 643 dprintk(DBG_INIT, "nbd: debugflags=0x%x\n", debugflags);
644 644
645 devfs_mk_dir("nbd");
646 for (i = 0; i < nbds_max; i++) { 645 for (i = 0; i < nbds_max; i++) {
647 struct gendisk *disk = nbd_dev[i].disk; 646 struct gendisk *disk = nbd_dev[i].disk;
648 nbd_dev[i].file = NULL; 647 nbd_dev[i].file = NULL;
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c
index 79b868254032..9f72bdd2e206 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -674,7 +674,6 @@ static int __init pg_init(void)
674 err = PTR_ERR(pg_class); 674 err = PTR_ERR(pg_class);
675 goto out_chrdev; 675 goto out_chrdev;
676 } 676 }
677 devfs_mk_dir("pg");
678 for (unit = 0; unit < PG_UNITS; unit++) { 677 for (unit = 0; unit < PG_UNITS; unit++) {
679 struct pg *dev = &devices[unit]; 678 struct pg *dev = &devices[unit];
680 if (dev->present) { 679 if (dev->present) {
diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c
index d2013d362403..7adadd5b29fc 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -971,7 +971,6 @@ static int __init pt_init(void)
971 goto out_chrdev; 971 goto out_chrdev;
972 } 972 }
973 973
974 devfs_mk_dir("pt");
975 for (unit = 0; unit < PT_UNITS; unit++) 974 for (unit = 0; unit < PT_UNITS; unit++)
976 if (pt[unit].present) { 975 if (pt[unit].present) {
977 class_device_create(pt_class, NULL, MKDEV(major, unit), 976 class_device_create(pt_class, NULL, MKDEV(major, unit),
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 940bfd7951e5..67821a8c6210 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -442,8 +442,6 @@ static int __init rd_init(void)
442 goto out; 442 goto out;
443 } 443 }
444 444
445 devfs_mk_dir("rd");
446
447 for (i = 0; i < CONFIG_BLK_DEV_RAM_COUNT; i++) { 445 for (i = 0; i < CONFIG_BLK_DEV_RAM_COUNT; i++) {
448 struct gendisk *disk = rd_disks[i]; 446 struct gendisk *disk = rd_disks[i];
449 447
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 01f042f6f1c4..018b2921e8fc 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -1019,8 +1019,6 @@ int swim3_init(void)
1019 int err = -ENOMEM; 1019 int err = -ENOMEM;
1020 int i; 1020 int i;
1021 1021
1022 devfs_mk_dir("floppy");
1023
1024 swim = find_devices("floppy"); 1022 swim = find_devices("floppy");
1025 while (swim && (floppy_count < MAX_FLOPPIES)) 1023 while (swim && (floppy_count < MAX_FLOPPIES))
1026 { 1024 {
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index 2ae08b343b93..9fb3f51e574e 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -1672,8 +1672,6 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
1672 if (host->flags & FL_DYN_MAJOR) 1672 if (host->flags & FL_DYN_MAJOR)
1673 host->major = rc; 1673 host->major = rc;
1674 1674
1675 devfs_mk_dir(DRV_NAME);
1676
1677 rc = carm_init_disks(host); 1675 rc = carm_init_disks(host);
1678 if (rc) 1676 if (rc)
1679 goto err_out_blkdev_disks; 1677 goto err_out_blkdev_disks;
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 60e9a9457c6b..088e5ba15c24 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -2445,7 +2445,6 @@ static int __init ub_init(void)
2445 2445
2446 if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0) 2446 if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0)
2447 goto err_regblkdev; 2447 goto err_regblkdev;
2448 devfs_mk_dir(DEVFS_NAME);
2449 2448
2450 if ((rc = usb_register(&ub_driver)) != 0) 2449 if ((rc = usb_register(&ub_driver)) != 0)
2451 goto err_register; 2450 goto err_register;