diff options
Diffstat (limited to 'drivers/s390/block/xpram.c')
-rw-r--r-- | drivers/s390/block/xpram.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index 54ecd548c318..4c1e56b9b98d 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c | |||
@@ -36,7 +36,6 @@ | |||
36 | #include <linux/hdreg.h> /* HDIO_GETGEO */ | 36 | #include <linux/hdreg.h> /* HDIO_GETGEO */ |
37 | #include <linux/sysdev.h> | 37 | #include <linux/sysdev.h> |
38 | #include <linux/bio.h> | 38 | #include <linux/bio.h> |
39 | #include <linux/devfs_fs_kernel.h> | ||
40 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
41 | 40 | ||
42 | #define XPRAM_NAME "xpram" | 41 | #define XPRAM_NAME "xpram" |
@@ -439,8 +438,6 @@ static int __init xpram_setup_blkdev(void) | |||
439 | if (rc < 0) | 438 | if (rc < 0) |
440 | goto out; | 439 | goto out; |
441 | 440 | ||
442 | devfs_mk_dir("slram"); | ||
443 | |||
444 | /* | 441 | /* |
445 | * Assign the other needed values: make request function, sizes and | 442 | * Assign the other needed values: make request function, sizes and |
446 | * hardsect size. All the minor devices feature the same value. | 443 | * hardsect size. All the minor devices feature the same value. |
@@ -469,14 +466,12 @@ static int __init xpram_setup_blkdev(void) | |||
469 | disk->private_data = &xpram_devices[i]; | 466 | disk->private_data = &xpram_devices[i]; |
470 | disk->queue = xpram_queue; | 467 | disk->queue = xpram_queue; |
471 | sprintf(disk->disk_name, "slram%d", i); | 468 | sprintf(disk->disk_name, "slram%d", i); |
472 | sprintf(disk->devfs_name, "slram/%d", i); | ||
473 | set_capacity(disk, xpram_sizes[i] << 1); | 469 | set_capacity(disk, xpram_sizes[i] << 1); |
474 | add_disk(disk); | 470 | add_disk(disk); |
475 | } | 471 | } |
476 | 472 | ||
477 | return 0; | 473 | return 0; |
478 | out_unreg: | 474 | out_unreg: |
479 | devfs_remove("slram"); | ||
480 | unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME); | 475 | unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME); |
481 | out: | 476 | out: |
482 | while (i--) | 477 | while (i--) |
@@ -495,7 +490,6 @@ static void __exit xpram_exit(void) | |||
495 | put_disk(xpram_disks[i]); | 490 | put_disk(xpram_disks[i]); |
496 | } | 491 | } |
497 | unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME); | 492 | unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME); |
498 | devfs_remove("slram"); | ||
499 | blk_cleanup_queue(xpram_queue); | 493 | blk_cleanup_queue(xpram_queue); |
500 | sysdev_unregister(&xpram_sys_device); | 494 | sysdev_unregister(&xpram_sys_device); |
501 | sysdev_class_unregister(&xpram_sysclass); | 495 | sysdev_class_unregister(&xpram_sysclass); |