diff options
Diffstat (limited to 'drivers/block/ub.c')
-rw-r--r-- | drivers/block/ub.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index 60e9a9457c6b..d62b49fbf10c 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c | |||
@@ -24,12 +24,10 @@ | |||
24 | #include <linux/usb.h> | 24 | #include <linux/usb.h> |
25 | #include <linux/usb_usual.h> | 25 | #include <linux/usb_usual.h> |
26 | #include <linux/blkdev.h> | 26 | #include <linux/blkdev.h> |
27 | #include <linux/devfs_fs_kernel.h> | ||
28 | #include <linux/timer.h> | 27 | #include <linux/timer.h> |
29 | #include <scsi/scsi.h> | 28 | #include <scsi/scsi.h> |
30 | 29 | ||
31 | #define DRV_NAME "ub" | 30 | #define DRV_NAME "ub" |
32 | #define DEVFS_NAME DRV_NAME | ||
33 | 31 | ||
34 | #define UB_MAJOR 180 | 32 | #define UB_MAJOR 180 |
35 | 33 | ||
@@ -2291,7 +2289,6 @@ static int ub_probe_lun(struct ub_dev *sc, int lnum) | |||
2291 | goto err_diskalloc; | 2289 | goto err_diskalloc; |
2292 | 2290 | ||
2293 | sprintf(disk->disk_name, DRV_NAME "%c", lun->id + 'a'); | 2291 | sprintf(disk->disk_name, DRV_NAME "%c", lun->id + 'a'); |
2294 | sprintf(disk->devfs_name, DEVFS_NAME "/%c", lun->id + 'a'); | ||
2295 | disk->major = UB_MAJOR; | 2292 | disk->major = UB_MAJOR; |
2296 | disk->first_minor = lun->id * UB_PARTS_PER_LUN; | 2293 | disk->first_minor = lun->id * UB_PARTS_PER_LUN; |
2297 | disk->fops = &ub_bd_fops; | 2294 | disk->fops = &ub_bd_fops; |
@@ -2445,7 +2442,6 @@ static int __init ub_init(void) | |||
2445 | 2442 | ||
2446 | if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0) | 2443 | if ((rc = register_blkdev(UB_MAJOR, DRV_NAME)) != 0) |
2447 | goto err_regblkdev; | 2444 | goto err_regblkdev; |
2448 | devfs_mk_dir(DEVFS_NAME); | ||
2449 | 2445 | ||
2450 | if ((rc = usb_register(&ub_driver)) != 0) | 2446 | if ((rc = usb_register(&ub_driver)) != 0) |
2451 | goto err_register; | 2447 | goto err_register; |
@@ -2454,7 +2450,6 @@ static int __init ub_init(void) | |||
2454 | return 0; | 2450 | return 0; |
2455 | 2451 | ||
2456 | err_register: | 2452 | err_register: |
2457 | devfs_remove(DEVFS_NAME); | ||
2458 | unregister_blkdev(UB_MAJOR, DRV_NAME); | 2453 | unregister_blkdev(UB_MAJOR, DRV_NAME); |
2459 | err_regblkdev: | 2454 | err_regblkdev: |
2460 | return rc; | 2455 | return rc; |
@@ -2464,7 +2459,6 @@ static void __exit ub_exit(void) | |||
2464 | { | 2459 | { |
2465 | usb_deregister(&ub_driver); | 2460 | usb_deregister(&ub_driver); |
2466 | 2461 | ||
2467 | devfs_remove(DEVFS_NAME); | ||
2468 | unregister_blkdev(UB_MAJOR, DRV_NAME); | 2462 | unregister_blkdev(UB_MAJOR, DRV_NAME); |
2469 | usb_usual_clear_present(USB_US_TYPE_UB); | 2463 | usb_usual_clear_present(USB_US_TYPE_UB); |
2470 | } | 2464 | } |