Commit 9bf3aa83 authored by Christoph Hellwig's avatar Christoph Hellwig

[PATCH] devfs: gscd

parent a2610cd5
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
#include <linux/major.h> #include <linux/major.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/devfs_fs_kernel.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -883,7 +882,6 @@ static void __exit gscd_exit(void) ...@@ -883,7 +882,6 @@ static void __exit gscd_exit(void)
{ {
CLEAR_TIMER; CLEAR_TIMER;
devfs_remove("gscd");
del_gendisk(gscd_disk); del_gendisk(gscd_disk);
put_disk(gscd_disk); put_disk(gscd_disk);
if ((unregister_blkdev(MAJOR_NR, "gscd") == -EINVAL)) { if ((unregister_blkdev(MAJOR_NR, "gscd") == -EINVAL)) {
...@@ -958,15 +956,13 @@ static int __init gscd_init(void) ...@@ -958,15 +956,13 @@ static int __init gscd_init(void)
gscd_disk->first_minor = 0; gscd_disk->first_minor = 0;
gscd_disk->fops = &gscd_fops; gscd_disk->fops = &gscd_fops;
sprintf(gscd_disk->disk_name, "gscd"); sprintf(gscd_disk->disk_name, "gscd");
sprintf(gscd_disk->devfs_name, "gscd");
if (register_blkdev(MAJOR_NR, "gscd")) { if (register_blkdev(MAJOR_NR, "gscd")) {
ret = -EIO; ret = -EIO;
goto err_out2; goto err_out2;
} }
devfs_register(NULL, "gscd", DEVFS_FL_DEFAULT, MAJOR_NR, 0,
S_IFBLK | S_IRUGO | S_IWUGO, &gscd_fops, NULL);
blk_init_queue(&gscd_queue, do_gscd_request, &gscd_lock); blk_init_queue(&gscd_queue, do_gscd_request, &gscd_lock);
disk_state = 0; disk_state = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment