Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Removes the devfs_remove() function and all callers of it.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

+9 -161
-1
arch/sparc64/solaris/socksys.c
··· 205 205 { 206 206 if (unregister_chrdev(30, "socksys")) 207 207 printk ("Couldn't unregister socksys character device\n"); 208 - devfs_remove ("socksys"); 209 208 }
-4
drivers/block/acsi_slm.c
··· 1027 1027 1028 1028 void cleanup_module(void) 1029 1029 { 1030 - int i; 1031 - for (i = 0; i < MAX_SLM; i++) 1032 - devfs_remove("slm/%d", i); 1033 - devfs_remove("slm"); 1034 1030 if (unregister_chrdev( ACSI_MAJOR, "slm" ) != 0) 1035 1031 printk( KERN_ERR "acsi_slm: cleanup_module failed\n"); 1036 1032 atari_stram_free( SLMBuffer );
-2
drivers/block/cpqarray.c
··· 348 348 for(j = 0; j < NWD; j++) { 349 349 if (ida_gendisk[i][j]->flags & GENHD_FL_UP) 350 350 del_gendisk(ida_gendisk[i][j]); 351 - devfs_remove("ida/c%dd%d",i,j); 352 351 put_disk(ida_gendisk[i][j]); 353 352 } 354 353 blk_cleanup_queue(hba[i]->queue); ··· 1843 1844 } 1844 1845 } 1845 1846 1846 - devfs_remove("ida"); 1847 1847 remove_proc_entry("cpqarray", proc_root_driver); 1848 1848 } 1849 1849
+1 -32
drivers/block/floppy.c
··· 3952 3952 .media_changed = check_floppy_change, 3953 3953 .revalidate_disk = floppy_revalidate, 3954 3954 }; 3955 - static char *table[] = { 3956 - "", "d360", "h1200", "u360", "u720", "h360", "h720", 3957 - "u1440", "u2880", "CompaQ", "h1440", "u1680", "h410", 3958 - "u820", "h1476", "u1722", "h420", "u830", "h1494", "u1743", 3959 - "h880", "u1040", "u1120", "h1600", "u1760", "u1920", 3960 - "u3200", "u3520", "u3840", "u1840", "u800", "u1600", 3961 - NULL 3962 - }; 3963 - static int t360[] = { 1, 0 }, 3964 - t1200[] = { 2, 5, 6, 10, 12, 14, 16, 18, 20, 23, 0 }, 3965 - t3in[] = { 8, 9, 26, 27, 28, 7, 11, 15, 19, 24, 25, 29, 31, 3, 4, 13, 3966 - 17, 21, 22, 30, 0 }; 3967 - static int *table_sup[] = 3968 - { NULL, t360, t1200, t3in + 5 + 8, t3in + 5, t3in, t3in }; 3969 3955 3970 3956 /* 3971 3957 * Floppy Driver initialization ··· 4230 4244 4231 4245 err = register_blkdev(FLOPPY_MAJOR, "fd"); 4232 4246 if (err) 4233 - goto out_devfs_remove; 4247 + goto out_put_disk; 4234 4248 4235 4249 floppy_queue = blk_init_queue(do_fd_request, &floppy_lock); 4236 4250 if (!floppy_queue) { ··· 4389 4403 blk_cleanup_queue(floppy_queue); 4390 4404 out_unreg_blkdev: 4391 4405 unregister_blkdev(FLOPPY_MAJOR, "fd"); 4392 - out_devfs_remove: 4393 - devfs_remove("floppy"); 4394 4406 out_put_disk: 4395 4407 while (dr--) { 4396 4408 del_timer(&motor_off_timer[dr]); ··· 4549 4565 4550 4566 static char *floppy; 4551 4567 4552 - static void unregister_devfs_entries(int drive) 4553 - { 4554 - int i; 4555 - 4556 - if (UDP->cmos < ARRAY_SIZE(default_drive_params)) { 4557 - i = 0; 4558 - do { 4559 - devfs_remove("floppy/%d%s", drive, 4560 - table[table_sup[UDP->cmos][i]]); 4561 - } while (table_sup[UDP->cmos][i++]); 4562 - } 4563 - } 4564 - 4565 4568 static void __init parse_floppy_cfg_string(char *cfg) 4566 4569 { 4567 4570 char *ptr; ··· 4585 4614 if ((allowed_drive_mask & (1 << drive)) && 4586 4615 fdc_state[FDC(drive)].version != FDC_NONE) { 4587 4616 del_gendisk(disks[drive]); 4588 - unregister_devfs_entries(drive); 4589 4617 device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos); 4590 4618 platform_device_unregister(&floppy_device[drive]); 4591 4619 } 4592 4620 put_disk(disks[drive]); 4593 4621 } 4594 - devfs_remove("floppy"); 4595 4622 4596 4623 del_timer_sync(&fd_timeout); 4597 4624 del_timer_sync(&fd_timer);
-2
drivers/block/loop.c
··· 1308 1308 out_mem4: 1309 1309 while (i--) 1310 1310 blk_cleanup_queue(loop_dev[i].lo_queue); 1311 - devfs_remove("loop"); 1312 1311 i = max_loop; 1313 1312 out_mem3: 1314 1313 while (i--) ··· 1330 1331 blk_cleanup_queue(loop_dev[i].lo_queue); 1331 1332 put_disk(disks[i]); 1332 1333 } 1333 - devfs_remove("loop"); 1334 1334 if (unregister_blkdev(LOOP_MAJOR, "loop")) 1335 1335 printk(KERN_WARNING "loop: cannot unregister blkdev\n"); 1336 1336
-1
drivers/block/nbd.c
··· 685 685 put_disk(disk); 686 686 } 687 687 } 688 - devfs_remove("nbd"); 689 688 unregister_blkdev(NBD_MAJOR, "nbd"); 690 689 printk(KERN_INFO "nbd: unregistered device at major %d\n", NBD_MAJOR); 691 690 }
+1 -4
drivers/block/paride/pg.c
··· 695 695 696 696 for (unit = 0; unit < PG_UNITS; unit++) { 697 697 struct pg *dev = &devices[unit]; 698 - if (dev->present) { 698 + if (dev->present) 699 699 class_device_destroy(pg_class, MKDEV(major, unit)); 700 - devfs_remove("pg/%u", unit); 701 - } 702 700 } 703 701 class_destroy(pg_class); 704 - devfs_remove("pg"); 705 702 unregister_chrdev(major, name); 706 703 707 704 for (unit = 0; unit < PG_UNITS; unit++) {
-3
drivers/block/paride/pt.c
··· 992 992 for (unit = 0; unit < PT_UNITS; unit++) 993 993 if (pt[unit].present) { 994 994 class_device_destroy(pt_class, MKDEV(major, unit)); 995 - devfs_remove("pt/%d", unit); 996 995 class_device_destroy(pt_class, MKDEV(major, unit + 128)); 997 - devfs_remove("pt/%dn", unit); 998 996 } 999 997 class_destroy(pt_class); 1000 - devfs_remove("pt"); 1001 998 unregister_chrdev(major, name); 1002 999 for (unit = 0; unit < PT_UNITS; unit++) 1003 1000 if (pt[unit].present)
-1
drivers/block/rd.c
··· 412 412 put_disk(rd_disks[i]); 413 413 blk_cleanup_queue(rd_queue[i]); 414 414 } 415 - devfs_remove("rd"); 416 415 unregister_blkdev(RAMDISK_MAJOR, "ramdisk"); 417 416 } 418 417
-1
drivers/block/sx8.c
··· 1736 1736 1737 1737 free_irq(pdev->irq, host); 1738 1738 carm_free_disks(host); 1739 - devfs_remove(DRV_NAME); 1740 1739 unregister_blkdev(host->major, host->name); 1741 1740 if (host->major == 160) 1742 1741 clear_bit(0, &carm_major_alloc);
-2
drivers/block/ub.c
··· 2453 2453 return 0; 2454 2454 2455 2455 err_register: 2456 - devfs_remove(DEVFS_NAME); 2457 2456 unregister_blkdev(UB_MAJOR, DRV_NAME); 2458 2457 err_regblkdev: 2459 2458 return rc; ··· 2462 2463 { 2463 2464 usb_deregister(&ub_driver); 2464 2465 2465 - devfs_remove(DEVFS_NAME); 2466 2466 unregister_blkdev(UB_MAJOR, DRV_NAME); 2467 2467 usb_usual_clear_present(USB_US_TYPE_UB); 2468 2468 }
-2
drivers/cdrom/sbpcd.c
··· 5904 5904 if (D_S[j].drv_id==-1) continue; 5905 5905 del_gendisk(D_S[j].disk); 5906 5906 put_disk(D_S[j].disk); 5907 - devfs_remove("sbp/c0t%d", j); 5908 5907 vfree(D_S[j].sbp_buf); 5909 5908 if (D_S[j].sbp_audsiz>0) 5910 5909 vfree(D_S[j].aud_buf); ··· 5914 5915 } 5915 5916 vfree(D_S[j].sbpcd_infop); 5916 5917 } 5917 - devfs_remove("sbp"); 5918 5918 msg(DBG_INF, "%s module released.\n", major_name); 5919 5919 } 5920 5920
-1
drivers/char/dsp56k.c
··· 533 533 class_device_destroy(dsp56k_class, MKDEV(DSP56K_MAJOR, 0)); 534 534 class_destroy(dsp56k_class); 535 535 unregister_chrdev(DSP56K_MAJOR, "dsp56k"); 536 - devfs_remove("dsp56k"); 537 536 } 538 537 module_exit(dsp56k_cleanup_driver); 539 538
-1
drivers/char/dtlk.c
··· 354 354 355 355 dtlk_write_tts(DTLK_CLEAR); 356 356 unregister_chrdev(dtlk_major, "dtlk"); 357 - devfs_remove("dtlk"); 358 357 release_region(dtlk_port_lpc, DTLK_IO_EXTENT); 359 358 } 360 359
-6
drivers/char/ftape/zftape/zftape-init.c
··· 362 362 TRACE(ft_t_info, "successful"); 363 363 } 364 364 for (i = 0; i < 4; i++) { 365 - devfs_remove("qft%i", i); 366 365 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i)); 367 - devfs_remove("nqft%i", i); 368 366 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 4)); 369 - devfs_remove("zqft%i", i); 370 367 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 16)); 371 - devfs_remove("nzqft%i", i); 372 368 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 20)); 373 - devfs_remove("rawqft%i", i); 374 369 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 32)); 375 - devfs_remove("nrawqft%i", i); 376 370 class_device_destroy(zft_class, MKDEV(QIC117_TAPE_MAJOR, i + 36)); 377 371 } 378 372 class_destroy(zft_class);
-3
drivers/char/ip2/ip2main.c
··· 414 414 /* free io addresses and Tibet */ 415 415 release_region( ip2config.addr[i], 8 ); 416 416 class_device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i)); 417 - devfs_remove("ip2/ipl%d", i); 418 417 class_device_destroy(ip2_class, MKDEV(IP2_IPL_MAJOR, 4 * i + 1)); 419 - devfs_remove("ip2/stat%d", i); 420 418 } 421 419 /* Disable and remove interrupt handler. */ 422 420 if ( (ip2config.irq[i] > 0) && have_requested_irq(ip2config.irq[i]) ) { ··· 423 425 } 424 426 } 425 427 class_destroy(ip2_class); 426 - devfs_remove("ip2"); 427 428 if ( ( err = tty_unregister_driver ( ip2_tty_driver ) ) ) { 428 429 printk(KERN_ERR "IP2: failed to unregister tty driver (%d)\n", err); 429 430 }
-2
drivers/char/ipmi/ipmi_devintf.c
··· 833 833 } 834 834 class_device_destroy(ipmi_class, dev); 835 835 mutex_unlock(&reg_list_mutex); 836 - devfs_remove("ipmidev/%d", if_num); 837 836 } 838 837 839 838 static struct ipmi_smi_watcher smi_watcher = ··· 892 893 mutex_unlock(&reg_list_mutex); 893 894 class_destroy(ipmi_class); 894 895 ipmi_smi_watcher_unregister(&smi_watcher); 895 - devfs_remove(DEVICE_NAME); 896 896 unregister_chrdev(ipmi_major, DEVICE_NAME); 897 897 } 898 898 module_exit(cleanup_ipmi);
+1 -4
drivers/char/istallion.c
··· 849 849 return; 850 850 } 851 851 put_tty_driver(stli_serial); 852 - for (i = 0; i < 4; i++) { 853 - devfs_remove("staliomem/%d", i); 852 + for (i = 0; i < 4; i++) 854 853 class_device_destroy(istallion_class, MKDEV(STL_SIOMEMMAJOR, i)); 855 - } 856 - devfs_remove("staliomem"); 857 854 class_destroy(istallion_class); 858 855 if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem"))) 859 856 printk("STALLION: failed to un-register serial memory device, "
-3
drivers/char/lp.c
··· 930 930 out_class: 931 931 class_destroy(lp_class); 932 932 out_devfs: 933 - devfs_remove("printers"); 934 933 unregister_chrdev(LP_MAJOR, "lp"); 935 934 return err; 936 935 } ··· 977 978 if (lp_table[offset].dev == NULL) 978 979 continue; 979 980 parport_unregister_device(lp_table[offset].dev); 980 - devfs_remove("printers/%d", offset); 981 981 class_device_destroy(lp_class, MKDEV(LP_MAJOR, offset)); 982 982 } 983 - devfs_remove("printers"); 984 983 class_destroy(lp_class); 985 984 } 986 985
-1
drivers/char/misc.c
··· 271 271 down(&misc_sem); 272 272 list_del(&misc->list); 273 273 class_device_destroy(misc_class, MKDEV(MISC_MAJOR, misc->minor)); 274 - devfs_remove(misc->devfs_name); 275 274 if (i < DYNAMIC_MINORS && i>0) { 276 275 misc_minors[i>>3] &= ~(1 << (misc->minor & 7)); 277 276 }
+1 -8
drivers/char/ppdev.c
··· 770 770 771 771 static int __init ppdev_init (void) 772 772 { 773 - int i, err = 0; 773 + int err = 0; 774 774 775 775 if (register_chrdev (PP_MAJOR, CHRDEV, &pp_fops)) { 776 776 printk (KERN_WARNING CHRDEV ": unable to get major %d\n", ··· 791 791 goto out; 792 792 793 793 out_class: 794 - for (i = 0; i < PARPORT_MAX; i++) 795 - devfs_remove("parports/%d", i); 796 - devfs_remove("parports"); 797 794 class_destroy(ppdev_class); 798 795 out_chrdev: 799 796 unregister_chrdev(PP_MAJOR, CHRDEV); ··· 800 803 801 804 static void __exit ppdev_cleanup (void) 802 805 { 803 - int i; 804 806 /* Clean up all parport stuff */ 805 - for (i = 0; i < PARPORT_MAX; i++) 806 - devfs_remove("parports/%d", i); 807 807 parport_unregister_driver(&pp_driver); 808 - devfs_remove("parports"); 809 808 class_destroy(ppdev_class); 810 809 unregister_chrdev (PP_MAJOR, CHRDEV); 811 810 }
-6
drivers/char/raw.c
··· 318 318 319 319 static void __exit raw_exit(void) 320 320 { 321 - int i; 322 - 323 - for (i = 1; i < MAX_RAW_MINORS; i++) 324 - devfs_remove("raw/raw%d", i); 325 - devfs_remove("raw/rawctl"); 326 - devfs_remove("raw"); 327 321 class_device_destroy(raw_class, MKDEV(RAW_MAJOR, 0)); 328 322 class_destroy(raw_class); 329 323 cdev_del(&raw_cdev);
+1 -4
drivers/char/stallion.c
··· 773 773 restore_flags(flags); 774 774 return; 775 775 } 776 - for (i = 0; i < 4; i++) { 777 - devfs_remove("staliomem/%d", i); 776 + for (i = 0; i < 4; i++) 778 777 class_device_destroy(stallion_class, MKDEV(STL_SIOMEMMAJOR, i)); 779 - } 780 - devfs_remove("staliomem"); 781 778 if ((i = unregister_chrdev(STL_SIOMEMMAJOR, "staliomem"))) 782 779 printk("STALLION: failed to un-register serial memory device, " 783 780 "errno=%d\n", -i);
-3
drivers/char/tipar.c
··· 515 515 class_destroy(tipar_class); 516 516 517 517 out_chrdev: 518 - devfs_remove("ticables/par"); 519 518 unregister_chrdev(TIPAR_MAJOR, "tipar"); 520 519 out: 521 520 return err; ··· 535 536 continue; 536 537 parport_unregister_device(table[i].dev); 537 538 class_device_destroy(tipar_class, MKDEV(TIPAR_MAJOR, i)); 538 - devfs_remove("ticables/par/%d", i); 539 539 } 540 540 class_destroy(tipar_class); 541 - devfs_remove("ticables/par"); 542 541 543 542 pr_info("tipar: module unloaded\n"); 544 543 }
-1
drivers/char/tty_io.c
··· 2997 2997 */ 2998 2998 void tty_unregister_device(struct tty_driver *driver, unsigned index) 2999 2999 { 3000 - devfs_remove("%s%d", driver->devfs_name, index + driver->name_base); 3001 3000 class_device_destroy(tty_class, MKDEV(driver->major, driver->minor_start) + index); 3002 3001 } 3003 3002
-2
drivers/char/vc_screen.c
··· 485 485 } 486 486 void vcs_remove_devfs(struct tty_struct *tty) 487 487 { 488 - devfs_remove("vcc/%u", tty->index + 1); 489 - devfs_remove("vcc/a%u", tty->index + 1); 490 488 class_device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 1)); 491 489 class_device_destroy(vc_class, MKDEV(VCS_MAJOR, tty->index + 129)); 492 490 }
-2
drivers/char/viotape.c
··· 970 970 { 971 971 int i = vdev->unit_address; 972 972 973 - devfs_remove("iseries/nvt%d", i); 974 - devfs_remove("iseries/vt%d", i); 975 973 class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i | 0x80)); 976 974 class_device_destroy(tape_class, MKDEV(VIOTAPE_MAJOR, i)); 977 975 return 0;
-1
drivers/isdn/capi/capi.c
··· 1550 1550 class_device_destroy(capi_class, MKDEV(capi_major, 0)); 1551 1551 class_destroy(capi_class); 1552 1552 unregister_chrdev(capi_major, "capi20"); 1553 - devfs_remove("isdn/capi20"); 1554 1553 1555 1554 #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE 1556 1555 capinc_tty_exit();
-1
drivers/isdn/hardware/eicon/divamnt.c
··· 178 178 179 179 static void divas_maint_unregister_chrdev(void) 180 180 { 181 - devfs_remove(DEVNAME); 182 181 unregister_chrdev(major, DEVNAME); 183 182 } 184 183
-1
drivers/isdn/hardware/eicon/divasi.c
··· 145 145 146 146 static void divas_idi_unregister_chrdev(void) 147 147 { 148 - devfs_remove(DEVNAME); 149 148 unregister_chrdev(major, DEVNAME); 150 149 } 151 150
-1
drivers/isdn/hardware/eicon/divasmain.c
··· 678 678 679 679 static void divas_unregister_chrdev(void) 680 680 { 681 - devfs_remove(DEVNAME); 682 681 unregister_chrdev(major, DEVNAME); 683 682 } 684 683
-13
drivers/md/dm-ioctl.c
··· 74 74 static void dm_hash_exit(void) 75 75 { 76 76 dm_hash_remove_all(0); 77 - devfs_remove(DM_DIR); 78 77 } 79 78 80 79 /*----------------------------------------------------------------- ··· 170 171 } 171 172 172 173 /* 173 - * devfs stuff. 174 - */ 175 - static int unregister_with_devfs(struct hash_cell *hc) 176 - { 177 - devfs_remove(DM_DIR"/%s", hc->name); 178 - return 0; 179 - } 180 - 181 - /* 182 174 * The kdev_t and uuid of a device can never change once it is 183 175 * initially inserted. 184 176 */ ··· 224 234 /* remove from the dev hash */ 225 235 list_del(&hc->uuid_list); 226 236 list_del(&hc->name_list); 227 - unregister_with_devfs(hc); 228 237 dm_set_mdptr(hc->md, NULL); 229 238 230 239 table = dm_get_table(hc->md); ··· 319 330 /* 320 331 * rename and move the name cell. 321 332 */ 322 - unregister_with_devfs(hc); 323 - 324 333 list_del(&hc->name_list); 325 334 old_name = hc->name; 326 335 hc->name = new_name;
+1 -7
drivers/md/md.c
··· 5611 5611 { 5612 5612 mddev_t *mddev; 5613 5613 struct list_head *tmp; 5614 - int i; 5614 + 5615 5615 blk_unregister_region(MKDEV(MAJOR_NR,0), MAX_MD_DEVS); 5616 5616 blk_unregister_region(MKDEV(mdp_major,0), MAX_MD_DEVS << MdpMinorShift); 5617 - for (i=0; i < MAX_MD_DEVS; i++) 5618 - devfs_remove("md/%d", i); 5619 - for (i=0; i < MAX_MD_DEVS; i++) 5620 - devfs_remove("md/d%d", i); 5621 - 5622 - devfs_remove("md"); 5623 5617 5624 5618 unregister_blkdev(MAJOR_NR,"md"); 5625 5619 unregister_blkdev(mdp_major, "mdp");
-6
drivers/media/dvb/dvb-core/dvbdev.c
··· 248 248 if (!dvbdev) 249 249 return; 250 250 251 - devfs_remove("dvb/adapter%d/%s%d", dvbdev->adapter->num, 252 - dnames[dvbdev->type], dvbdev->id); 253 - 254 251 class_device_destroy(dvb_class, MKDEV(DVB_MAJOR, nums2minor(dvbdev->adapter->num, 255 252 dvbdev->type, dvbdev->id))); 256 253 ··· 311 314 312 315 int dvb_unregister_adapter(struct dvb_adapter *adap) 313 316 { 314 - devfs_remove("dvb/adapter%d", adap->num); 315 - 316 317 if (mutex_lock_interruptible(&dvbdev_register_lock)) 317 318 return -ERESTARTSYS; 318 319 list_del (&adap->list_head); ··· 416 421 417 422 static void __exit exit_dvbdev(void) 418 423 { 419 - devfs_remove("dvb"); 420 424 class_destroy(dvb_class); 421 425 cdev_del(&dvb_device_cdev); 422 426 unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS);
-1
drivers/media/video/videodev.c
··· 1601 1601 if(video_device[vfd->minor]!=vfd) 1602 1602 panic("videodev: bad unregister"); 1603 1603 1604 - devfs_remove(vfd->devfs_name); 1605 1604 video_device[vfd->minor]=NULL; 1606 1605 class_device_unregister(&vfd->class_dev); 1607 1606 mutex_unlock(&videodev_lock);
-1
drivers/mmc/mmc_block.c
··· 564 564 static void __exit mmc_blk_exit(void) 565 565 { 566 566 mmc_unregister_driver(&mmc_driver); 567 - devfs_remove("mmc"); 568 567 unregister_blkdev(major, "mmc"); 569 568 } 570 569
-1
drivers/net/ppp_generic.c
··· 2674 2674 cardmap_destroy(&all_ppp_units); 2675 2675 if (unregister_chrdev(PPP_MAJOR, "ppp") != 0) 2676 2676 printk(KERN_ERR "PPP: failed to unregister PPP device\n"); 2677 - devfs_remove("ppp"); 2678 2677 class_device_destroy(ppp_class, MKDEV(PPP_MAJOR, 0)); 2679 2678 class_destroy(ppp_class); 2680 2679 }
+1 -4
drivers/net/wan/cosa.c
··· 418 418 int i; 419 419 printk(KERN_INFO "Unloading the cosa module\n"); 420 420 421 - for (i=0; i<nr_cards; i++) { 421 + for (i=0; i<nr_cards; i++) 422 422 class_device_destroy(cosa_class, MKDEV(cosa_major, i)); 423 - devfs_remove("cosa/%d", i); 424 - } 425 423 class_destroy(cosa_class); 426 - devfs_remove("cosa"); 427 424 for (cosa=cosa_cards; nr_cards--; cosa++) { 428 425 /* Clean up the per-channel data */ 429 426 for (i=0; i<cosa->nchannels; i++) {
-1
drivers/s390/block/dasd.c
··· 1834 1834 } 1835 1835 dasd_gendisk_exit(); 1836 1836 dasd_devmap_exit(); 1837 - devfs_remove("dasd"); 1838 1837 if (dasd_debug_area != NULL) { 1839 1838 debug_unregister(dasd_debug_area); 1840 1839 dasd_debug_area = NULL;
-2
drivers/s390/block/xpram.c
··· 474 474 475 475 return 0; 476 476 out_unreg: 477 - devfs_remove("slram"); 478 477 unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME); 479 478 out: 480 479 while (i--) ··· 492 493 put_disk(xpram_disks[i]); 493 494 } 494 495 unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME); 495 - devfs_remove("slram"); 496 496 blk_cleanup_queue(xpram_queue); 497 497 sysdev_unregister(&xpram_sys_device); 498 498 sysdev_class_unregister(&xpram_sysclass);
-3
drivers/sbus/char/bpp.c
··· 1039 1039 { 1040 1040 unsigned idx; 1041 1041 1042 - for (idx = 0; idx < BPP_NO; idx++) 1043 - devfs_remove("bpp/%d", idx); 1044 - devfs_remove("bpp"); 1045 1042 unregister_chrdev(BPP_MAJOR, dev_name); 1046 1043 1047 1044 for (idx = 0; idx < BPP_NO; idx++) {
-2
drivers/sbus/char/vfc_dev.c
··· 712 712 { 713 713 if(dev == NULL) 714 714 return; 715 - devfs_remove("vfc/%d", dev->instance); 716 715 sbus_iounmap(dev->regs, sizeof(struct vfc_regs)); 717 716 kfree(dev); 718 717 } ··· 725 726 for (devp = vfc_dev_lst; *devp; devp++) 726 727 deinit_vfc_device(*devp); 727 728 728 - devfs_remove("vfc"); 729 729 kfree(vfc_dev_lst); 730 730 return; 731 731 }
-1
drivers/telephony/phonedev.c
··· 123 123 mutex_lock(&phone_lock); 124 124 if (phone_device[pfd->minor] != pfd) 125 125 panic("phone: bad unregister"); 126 - devfs_remove("phone/%d", pfd->minor); 127 126 phone_device[pfd->minor] = NULL; 128 127 mutex_unlock(&phone_lock); 129 128 }
-1
drivers/video/fbmem.c
··· 1357 1357 i = fb_info->node; 1358 1358 if (!registered_fb[i]) 1359 1359 return -EINVAL; 1360 - devfs_remove("fb/%d", i); 1361 1360 1362 1361 if (fb_info->pixmap.addr && 1363 1362 (fb_info->pixmap.flags & FB_PIXMAP_DEFAULT))
+2 -8
fs/coda/psdev.c
··· 409 409 } 410 410 return 0; 411 411 out: 412 - for (i = 0; i < MAX_CODADEVS; i++) { 412 + for (i = 0; i < MAX_CODADEVS; i++) 413 413 class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i)); 414 - devfs_remove("coda/%d", i); 415 - } 416 414 class_destroy(coda_psdev_class); 417 - devfs_remove("coda"); 418 415 unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); 419 416 coda_sysctl_clean(); 420 417 out1: ··· 428 431 if ( err != 0 ) { 429 432 printk("coda: failed to unregister filesystem\n"); 430 433 } 431 - for (i = 0; i < MAX_CODADEVS; i++) { 434 + for (i = 0; i < MAX_CODADEVS; i++) 432 435 class_device_destroy(coda_psdev_class, MKDEV(CODA_PSDEV_MAJOR, i)); 433 - devfs_remove("coda/%d", i); 434 - } 435 436 class_destroy(coda_psdev_class); 436 - devfs_remove("coda"); 437 437 unregister_chrdev(CODA_PSDEV_MAJOR, "coda"); 438 438 coda_sysctl_clean(); 439 439 coda_destroy_inodecache();
-1
fs/partitions/check.c
··· 320 320 p->nr_sects = 0; 321 321 p->ios[0] = p->ios[1] = 0; 322 322 p->sectors[0] = p->sectors[1] = 0; 323 - devfs_remove("%s/part%d", disk->devfs_name, part); 324 323 sysfs_remove_link(&p->kobj, "subsystem"); 325 324 if (p->holder_dir) 326 325 kobject_unregister(p->holder_dir);
-3
include/linux/devfs_fs_kernel.h
··· 6 6 #include <linux/types.h> 7 7 #include <asm/semaphore.h> 8 8 9 - static inline void devfs_remove(const char *fmt, ...) 10 - { 11 - } 12 9 #endif /* _LINUX_DEVFS_FS_KERNEL_H */