Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 95dc112a5770dc670a1b45a3d9ee346fdd2b2697

Authored by Greg Kroah-Hartman
1 parent 0e6c62da7c
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[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>

Showing 33 changed files with 1 additions and 55 deletions Side-by-side Diff

arch/um/drivers/ubd_kern.c
Diff comments   View file @ 95dc112
... ... @@ -841,7 +841,6 @@
841 841 {
842 842 int i;
843 843  
844   - devfs_mk_dir("ubd");
845 844 if (register_blkdev(MAJOR_NR, "ubd"))
846 845 return -1;
847 846  
... ... @@ -855,7 +854,6 @@
855 854 char name[sizeof("ubd_nnn\0")];
856 855  
857 856 snprintf(name, sizeof(name), "ubd_%d", fake_major);
858   - devfs_mk_dir(name);
859 857 if (register_blkdev(fake_major, "ubd"))
860 858 return -1;
861 859 }
drivers/block/acsi_slm.c
Diff comments   View file @ 95dc112
... ... @@ -1005,7 +1005,6 @@
1005 1005 BufferP = SLMBuffer;
1006 1006 SLMState = IDLE;
1007 1007  
1008   - devfs_mk_dir("slm");
1009 1008 for (i = 0; i < MAX_SLM; i++) {
1010 1009 devfs_mk_cdev(MKDEV(ACSI_MAJOR, i),
1011 1010 S_IFCHR|S_IRUSR|S_IWUSR, "slm/%d", i);
drivers/block/floppy.c
Diff comments   View file @ 95dc112
... ... @@ -4261,8 +4261,6 @@
4261 4261 motor_off_timer[dr].function = motor_off_callback;
4262 4262 }
4263 4263  
4264   - devfs_mk_dir("floppy");
4265   -
4266 4264 err = register_blkdev(FLOPPY_MAJOR, "fd");
4267 4265 if (err)
4268 4266 goto out_devfs_remove;
drivers/block/loop.c
Diff comments   View file @ 95dc112
... ... @@ -1277,8 +1277,6 @@
1277 1277 goto out_mem3;
1278 1278 }
1279 1279  
1280   - devfs_mk_dir("loop");
1281   -
1282 1280 for (i = 0; i < max_loop; i++) {
1283 1281 struct loop_device *lo = &loop_dev[i];
1284 1282 struct gendisk *disk = disks[i];
... ... @@ -642,7 +642,6 @@
642 642 printk(KERN_INFO "nbd: registered device at major %d\n", NBD_MAJOR);
643 643 dprintk(DBG_INIT, "nbd: debugflags=0x%x\n", debugflags);
644 644  
645   - devfs_mk_dir("nbd");
646 645 for (i = 0; i < nbds_max; i++) {
647 646 struct gendisk *disk = nbd_dev[i].disk;
648 647 nbd_dev[i].file = NULL;
drivers/block/paride/pg.c
Diff comments   View file @ 95dc112
... ... @@ -674,7 +674,6 @@
674 674 err = PTR_ERR(pg_class);
675 675 goto out_chrdev;
676 676 }
677   - devfs_mk_dir("pg");
678 677 for (unit = 0; unit < PG_UNITS; unit++) {
679 678 struct pg *dev = &devices[unit];
680 679 if (dev->present) {
drivers/block/paride/pt.c
Diff comments   View file @ 95dc112
... ... @@ -971,7 +971,6 @@
971 971 goto out_chrdev;
972 972 }
973 973  
974   - devfs_mk_dir("pt");
975 974 for (unit = 0; unit < PT_UNITS; unit++)
976 975 if (pt[unit].present) {
977 976 class_device_create(pt_class, NULL, MKDEV(major, unit),
... ... @@ -442,8 +442,6 @@
442 442 goto out;
443 443 }
444 444  
445   - devfs_mk_dir("rd");
446   -
447 445 for (i = 0; i < CONFIG_BLK_DEV_RAM_COUNT; i++) {
448 446 struct gendisk *disk = rd_disks[i];
449 447  
drivers/block/swim3.c
Diff comments   View file @ 95dc112
... ... @@ -1019,8 +1019,6 @@
1019 1019 int err = -ENOMEM;
1020 1020 int i;
1021 1021  
1022   - devfs_mk_dir("floppy");
1023   -
1024 1022 swim = find_devices("floppy");
1025 1023 while (swim && (floppy_count < MAX_FLOPPIES))
1026 1024 {
... ... @@ -1672,8 +1672,6 @@
1672 1672 if (host->flags & FL_DYN_MAJOR)
1673 1673 host->major = rc;
1674 1674  
1675   - devfs_mk_dir(DRV_NAME);
1676   -
1677 1675 rc = carm_init_disks(host);
1678 1676 if (rc)
1679 1677 goto err_out_blkdev_disks;
... ... @@ -2445,7 +2445,6 @@
2445 2445  
2446 2446 if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0)
2447 2447 goto err_regblkdev;
2448   - devfs_mk_dir(DEVFS_NAME);
2449 2448  
2450 2449 if ((rc = usb_register(&ub_driver)) != 0)
2451 2450 goto err_register;
drivers/cdrom/sbpcd.c
Diff comments   View file @ 95dc112
... ... @@ -5808,8 +5808,6 @@
5808 5808 return -ENOMEM;
5809 5809 }
5810 5810  
5811   - devfs_mk_dir("sbp");
5812   -
5813 5811 for (j=0;j<NR_SBPCD;j++)
5814 5812 {
5815 5813 struct cdrom_device_info * sbpcd_infop;
drivers/char/ipmi/ipmi_devintf.c
Diff comments   View file @ 95dc112
... ... @@ -872,8 +872,6 @@
872 872 ipmi_major = rv;
873 873 }
874 874  
875   - devfs_mk_dir(DEVICE_NAME);
876   -
877 875 rv = ipmi_smi_watcher_register(&smi_watcher);
878 876 if (rv) {
879 877 unregister_chrdev(ipmi_major, DEVICE_NAME);
drivers/char/istallion.c
Diff comments   View file @ 95dc112
... ... @@ -5213,7 +5213,6 @@
5213 5213 printk(KERN_ERR "STALLION: failed to register serial memory "
5214 5214 "device\n");
5215 5215  
5216   - devfs_mk_dir("staliomem");
5217 5216 istallion_class = class_create(THIS_MODULE, "staliomem");
5218 5217 for (i = 0; i < 4; i++) {
5219 5218 devfs_mk_cdev(MKDEV(STL_SIOMEMMAJOR, i),
... ... @@ -907,7 +907,6 @@
907 907 return -EIO;
908 908 }
909 909  
910   - devfs_mk_dir("printers");
911 910 lp_class = class_create(THIS_MODULE, "printer");
912 911 if (IS_ERR(lp_class)) {
913 912 err = PTR_ERR(lp_class);
drivers/char/ppdev.c
Diff comments   View file @ 95dc112
... ... @@ -782,7 +782,6 @@
782 782 err = PTR_ERR(ppdev_class);
783 783 goto out_chrdev;
784 784 }
785   - devfs_mk_dir("parports");
786 785 for (i = 0; i < PARPORT_MAX; i++) {
787 786 devfs_mk_cdev(MKDEV(PP_MAJOR, i),
788 787 S_IFCHR | S_IRUGO | S_IWUGO, "parports/%d", i);
... ... @@ -351,7 +351,6 @@
351 351  
352 352 static void __init unix98_pty_init(void)
353 353 {
354   - devfs_mk_dir("pts");
355 354 ptm_driver = alloc_tty_driver(NR_UNIX98_PTY_MAX);
356 355 if (!ptm_driver)
357 356 panic("Couldn't allocate Unix98 ptm driver");
drivers/char/stallion.c
Diff comments   View file @ 95dc112
... ... @@ -3069,7 +3069,6 @@
3069 3069 */
3070 3070 if (register_chrdev(STL_SIOMEMMAJOR, "staliomem", &stl_fsiomem))
3071 3071 printk("STALLION: failed to register serial board device\n");
3072   - devfs_mk_dir("staliomem");
3073 3072  
3074 3073 stallion_class = class_create(THIS_MODULE, "staliomem");
3075 3074 for (i = 0; i < 4; i++) {
drivers/char/tipar.c
Diff comments   View file @ 95dc112
... ... @@ -507,9 +507,6 @@
507 507 goto out;
508 508 }
509 509  
510   - /* Use devfs with tree: /dev/ticables/par/[0..2] */
511   - devfs_mk_dir("ticables/par");
512   -
513 510 tipar_class = class_create(THIS_MODULE, "ticables");
514 511 if (IS_ERR(tipar_class)) {
515 512 err = PTR_ERR(tipar_class);
drivers/md/dm-ioctl.c
Diff comments   View file @ 95dc112
... ... @@ -68,7 +68,6 @@
68 68 {
69 69 init_buckets(_name_buckets);
70 70 init_buckets(_uuid_buckets);
71   - devfs_mk_dir(DM_DIR);
72 71 return 0;
73 72 }
74 73  
... ... @@ -5553,7 +5553,6 @@
5553 5553 unregister_blkdev(MAJOR_NR, "md");
5554 5554 return -1;
5555 5555 }
5556   - devfs_mk_dir("md");
5557 5556 blk_register_region(MKDEV(MAJOR_NR, 0), MAX_MD_DEVS, THIS_MODULE,
5558 5557 md_probe, NULL, NULL);
5559 5558 blk_register_region(MKDEV(mdp_major, 0), MAX_MD_DEVS<<MdpMinorShift, THIS_MODULE,
drivers/media/dvb/dvb-core/dvbdev.c
Diff comments   View file @ 95dc112
... ... @@ -302,7 +302,6 @@
302 302  
303 303 printk ("DVB: registering new adapter (%s).\n", name);
304 304  
305   - devfs_mk_dir("dvb/adapter%d", num);
306 305 adap->num = num;
307 306 adap->name = name;
308 307 adap->module = module;
... ... @@ -409,8 +408,6 @@
409 408 printk("dvb-core: unable to get major %d\n", DVB_MAJOR);
410 409 goto error;
411 410 }
412   -
413   - devfs_mk_dir("dvb");
414 411  
415 412 dvb_class = class_create(THIS_MODULE, "dvb");
416 413 if (IS_ERR(dvb_class)) {
drivers/mmc/mmc_block.c
Diff comments   View file @ 95dc112
... ... @@ -555,7 +555,6 @@
555 555 if (major == 0)
556 556 major = res;
557 557  
558   - devfs_mk_dir("mmc");
559 558 return mmc_register_driver(&mmc_driver);
560 559  
561 560 out:
drivers/net/wan/cosa.c
Diff comments   View file @ 95dc112
... ... @@ -393,7 +393,6 @@
393 393 err = -ENODEV;
394 394 goto out;
395 395 }
396   - devfs_mk_dir("cosa");
397 396 cosa_class = class_create(THIS_MODULE, "cosa");
398 397 if (IS_ERR(cosa_class)) {
399 398 err = PTR_ERR(cosa_class);
drivers/s390/block/dasd.c
Diff comments   View file @ 95dc112
... ... @@ -2111,9 +2111,6 @@
2111 2111  
2112 2112 dasd_diag_discipline_pointer = NULL;
2113 2113  
2114   - rc = devfs_mk_dir("dasd");
2115   - if (rc)
2116   - goto failed;
2117 2114 rc = dasd_devmap_init();
2118 2115 if (rc)
2119 2116 goto failed;
drivers/s390/block/xpram.c
Diff comments   View file @ 95dc112
... ... @@ -439,8 +439,6 @@
439 439 if (rc < 0)
440 440 goto out;
441 441  
442   - devfs_mk_dir("slram");
443   -
444 442 /*
445 443 * Assign the other needed values: make request function, sizes and
446 444 * hardsect size. All the minor devices feature the same value.
drivers/sbus/char/bpp.c
Diff comments   View file @ 95dc112
... ... @@ -1031,7 +1031,6 @@
1031 1031 instances[idx].opened = 0;
1032 1032 probeLptPort(idx);
1033 1033 }
1034   - devfs_mk_dir("bpp");
1035 1034 for (idx = 0; idx < BPP_NO; idx++) {
1036 1035 devfs_mk_cdev(MKDEV(BPP_MAJOR, idx),
1037 1036 S_IFCHR | S_IRUSR | S_IWUSR, "bpp/%d", idx);
drivers/sbus/char/vfc_dev.c
Diff comments   View file @ 95dc112
... ... @@ -677,7 +677,6 @@
677 677 kfree(vfc_dev_lst);
678 678 return -EIO;
679 679 }
680   - devfs_mk_dir("vfc");
681 680 instance = 0;
682 681 for_all_sbusdev(sdev, sbus) {
683 682 if (strcmp(sdev->prom_name, "vfc") == 0) {
drivers/video/fbmem.c
Diff comments   View file @ 95dc112
... ... @@ -1432,7 +1432,6 @@
1432 1432 {
1433 1433 create_proc_read_entry("fb", 0, NULL, fbmem_read_proc, NULL);
1434 1434  
1435   - devfs_mk_dir("fb");
1436 1435 if (register_chrdev(FB_MAJOR,"fb",&fb_fops))
1437 1436 printk("unable to get major %d for fb devs\n", FB_MAJOR);
1438 1437  
... ... @@ -365,7 +365,6 @@
365 365 err = PTR_ERR(coda_psdev_class);
366 366 goto out_chrdev;
367 367 }
368   - devfs_mk_dir ("coda");
369 368 for (i = 0; i < MAX_CODADEVS; i++) {
370 369 class_device_create(coda_psdev_class, NULL,
371 370 MKDEV(CODA_PSDEV_MAJOR,i), NULL, "cfs%d", i);
include/linux/devfs_fs_kernel.h
Diff comments   View file @ 95dc112
... ... @@ -18,10 +18,6 @@
18 18 {
19 19 return 0;
20 20 }
21   -static inline int devfs_mk_dir(const char *fmt, ...)
22   -{
23   - return 0;
24   -}
25 21 static inline void devfs_remove(const char *fmt, ...)
26 22 {
27 23 }
... ... @@ -2252,9 +2252,7 @@
2252 2252 printk(KERN_ERR "Could not register tmpfs\n");
2253 2253 goto out2;
2254 2254 }
2255   -#ifdef CONFIG_TMPFS
2256   - devfs_mk_dir("shm");
2257   -#endif
  2255 +
2258 2256 shm_mnt = vfs_kern_mount(&tmpfs_fs_type, MS_NOUSER,
2259 2257 tmpfs_fs_type.name, NULL);
2260 2258 if (IS_ERR(shm_mnt)) {
... ... @@ -33,9 +33,6 @@
33 33 {
34 34 BUG_ON(register_filesystem(&tmpfs_fs_type) != 0);
35 35  
36   -#ifdef CONFIG_TMPFS
37   - devfs_mk_dir("shm");
38   -#endif
39 36 shm_mnt = kern_mount(&tmpfs_fs_type);
40 37 BUG_ON(IS_ERR(shm_mnt));
41 38