[PATCH] devfs: Remove devfs_remove() function from the kernel tree (8ab5e4c1) · Commits · e / devices / android_kernel_xiaomi_markw

arch/sparc64/solaris/socksys.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -205,5 +205,4 @@ cleanup_socksys(void)
	{		{
	if (unregister_chrdev(30, "socksys"))		if (unregister_chrdev(30, "socksys"))
	printk ("Couldn't unregister socksys character device\n");		printk ("Couldn't unregister socksys character device\n");
	devfs_remove ("socksys");
	}		}

drivers/block/acsi_slm.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1027,10 +1027,6 @@ int init_module(void)

	void cleanup_module(void)		void cleanup_module(void)
	{		{
	int i;
	for (i = 0; i < MAX_SLM; i++)
	devfs_remove("slm/%d", i);
	devfs_remove("slm");
	if (unregister_chrdev( ACSI_MAJOR, "slm" ) != 0)		if (unregister_chrdev( ACSI_MAJOR, "slm" ) != 0)
	printk( KERN_ERR "acsi_slm: cleanup_module failed\n");		printk( KERN_ERR "acsi_slm: cleanup_module failed\n");
	atari_stram_free( SLMBuffer );		atari_stram_free( SLMBuffer );

drivers/block/cpqarray.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -348,7 +348,6 @@ static void __devexit cpqarray_remove_one(int i)
	for(j = 0; j < NWD; j++) {		for(j = 0; j < NWD; j++) {
	if (ida_gendisk[i][j]->flags & GENHD_FL_UP)		if (ida_gendisk[i][j]->flags & GENHD_FL_UP)
	del_gendisk(ida_gendisk[i][j]);		del_gendisk(ida_gendisk[i][j]);
	devfs_remove("ida/c%dd%d",i,j);
	put_disk(ida_gendisk[i][j]);		put_disk(ida_gendisk[i][j]);
	}		}
	blk_cleanup_queue(hba[i]->queue);		blk_cleanup_queue(hba[i]->queue);
	@@ -1844,7 +1843,6 @@ static void __exit cpqarray_exit(void)
	}		}
	}		}

	devfs_remove("ida");
	remove_proc_entry("cpqarray", proc_root_driver);		remove_proc_entry("cpqarray", proc_root_driver);
	}		}

drivers/block/floppy.c

+1 −32

Original line number	Original line	Diff line number	Diff line
	@@ -3952,20 +3952,6 @@ static struct block_device_operations floppy_fops = {
	.media_changed = check_floppy_change,		.media_changed = check_floppy_change,
	.revalidate_disk = floppy_revalidate,		.revalidate_disk = floppy_revalidate,
	};		};
	static char *table[] = {
	"", "d360", "h1200", "u360", "u720", "h360", "h720",
	"u1440", "u2880", "CompaQ", "h1440", "u1680", "h410",
	"u820", "h1476", "u1722", "h420", "u830", "h1494", "u1743",
	"h880", "u1040", "u1120", "h1600", "u1760", "u1920",
	"u3200", "u3520", "u3840", "u1840", "u800", "u1600",
	NULL
	};
	static int t360[] = { 1, 0 },
	t1200[] = { 2, 5, 6, 10, 12, 14, 16, 18, 20, 23, 0 },
	t3in[] = { 8, 9, 26, 27, 28, 7, 11, 15, 19, 24, 25, 29, 31, 3, 4, 13,
	17, 21, 22, 30, 0 };
	static int *table_sup[] =
	{ NULL, t360, t1200, t3in + 5 + 8, t3in + 5, t3in, t3in };

	/*		/*
	* Floppy Driver initialization		* Floppy Driver initialization
	@@ -4244,7 +4230,7 @@ static int __init floppy_init(void)

	err = register_blkdev(FLOPPY_MAJOR, "fd");		err = register_blkdev(FLOPPY_MAJOR, "fd");
	if (err)		if (err)
	goto out_devfs_remove;		goto out_put_disk;

	floppy_queue = blk_init_queue(do_fd_request, &floppy_lock);		floppy_queue = blk_init_queue(do_fd_request, &floppy_lock);
	if (!floppy_queue) {		if (!floppy_queue) {
	@@ -4403,8 +4389,6 @@ out_unreg_region:
	blk_cleanup_queue(floppy_queue);		blk_cleanup_queue(floppy_queue);
	out_unreg_blkdev:		out_unreg_blkdev:
	unregister_blkdev(FLOPPY_MAJOR, "fd");		unregister_blkdev(FLOPPY_MAJOR, "fd");
	out_devfs_remove:
	devfs_remove("floppy");
	out_put_disk:		out_put_disk:
	while (dr--) {		while (dr--) {
	del_timer(&motor_off_timer[dr]);		del_timer(&motor_off_timer[dr]);
	@@ -4565,19 +4549,6 @@ static void floppy_release_irq_and_dma(void)

	static char *floppy;		static char *floppy;

	static void unregister_devfs_entries(int drive)
	{
	int i;

	if (UDP->cmos < ARRAY_SIZE(default_drive_params)) {
	i = 0;
	do {
	devfs_remove("floppy/%d%s", drive,
	table[table_sup[UDP->cmos][i]]);
	} while (table_sup[UDP->cmos][i++]);
	}
	}

	static void __init parse_floppy_cfg_string(char *cfg)		static void __init parse_floppy_cfg_string(char *cfg)
	{		{
	char *ptr;		char *ptr;
	@@ -4614,13 +4585,11 @@ void cleanup_module(void)
	if ((allowed_drive_mask & (1 << drive)) &&		if ((allowed_drive_mask & (1 << drive)) &&
	fdc_state[FDC(drive)].version != FDC_NONE) {		fdc_state[FDC(drive)].version != FDC_NONE) {
	del_gendisk(disks[drive]);		del_gendisk(disks[drive]);
	unregister_devfs_entries(drive);
	device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos);		device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos);
	platform_device_unregister(&floppy_device[drive]);		platform_device_unregister(&floppy_device[drive]);
	}		}
	put_disk(disks[drive]);		put_disk(disks[drive]);
	}		}
	devfs_remove("floppy");

	del_timer_sync(&fd_timeout);		del_timer_sync(&fd_timeout);
	del_timer_sync(&fd_timer);		del_timer_sync(&fd_timer);

drivers/block/loop.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1308,7 +1308,6 @@ static int __init loop_init(void)
	out_mem4:		out_mem4:
	while (i--)		while (i--)
	blk_cleanup_queue(loop_dev[i].lo_queue);		blk_cleanup_queue(loop_dev[i].lo_queue);
	devfs_remove("loop");
	i = max_loop;		i = max_loop;
	out_mem3:		out_mem3:
	while (i--)		while (i--)
	@@ -1331,7 +1330,6 @@ static void loop_exit(void)
	blk_cleanup_queue(loop_dev[i].lo_queue);		blk_cleanup_queue(loop_dev[i].lo_queue);
	put_disk(disks[i]);		put_disk(disks[i]);
	}		}
	devfs_remove("loop");
	if (unregister_blkdev(LOOP_MAJOR, "loop"))		if (unregister_blkdev(LOOP_MAJOR, "loop"))
	printk(KERN_WARNING "loop: cannot unregister blkdev\n");		printk(KERN_WARNING "loop: cannot unregister blkdev\n");