diff options
Diffstat (limited to 'drivers/block/sx8.c')
-rw-r--r-- | drivers/block/sx8.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index 8144ce9f4df0..10a4aa5fb54d 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
19 | #include <linux/blkdev.h> | 19 | #include <linux/blkdev.h> |
20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
21 | #include <linux/devfs_fs_kernel.h> | ||
22 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
23 | #include <linux/compiler.h> | 22 | #include <linux/compiler.h> |
24 | #include <linux/workqueue.h> | 23 | #include <linux/workqueue.h> |
@@ -1510,7 +1509,6 @@ static int carm_init_disks(struct carm_host *host) | |||
1510 | port->disk = disk; | 1509 | port->disk = disk; |
1511 | sprintf(disk->disk_name, DRV_NAME "/%u", | 1510 | sprintf(disk->disk_name, DRV_NAME "/%u", |
1512 | (unsigned int) (host->id * CARM_MAX_PORTS) + i); | 1511 | (unsigned int) (host->id * CARM_MAX_PORTS) + i); |
1513 | sprintf(disk->devfs_name, DRV_NAME "/%u_%u", host->id, i); | ||
1514 | disk->major = host->major; | 1512 | disk->major = host->major; |
1515 | disk->first_minor = i * CARM_MINORS_PER_MAJOR; | 1513 | disk->first_minor = i * CARM_MINORS_PER_MAJOR; |
1516 | disk->fops = &carm_bd_ops; | 1514 | disk->fops = &carm_bd_ops; |
@@ -1672,8 +1670,6 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1672 | if (host->flags & FL_DYN_MAJOR) | 1670 | if (host->flags & FL_DYN_MAJOR) |
1673 | host->major = rc; | 1671 | host->major = rc; |
1674 | 1672 | ||
1675 | devfs_mk_dir(DRV_NAME); | ||
1676 | |||
1677 | rc = carm_init_disks(host); | 1673 | rc = carm_init_disks(host); |
1678 | if (rc) | 1674 | if (rc) |
1679 | goto err_out_blkdev_disks; | 1675 | goto err_out_blkdev_disks; |
@@ -1739,7 +1735,6 @@ static void carm_remove_one (struct pci_dev *pdev) | |||
1739 | 1735 | ||
1740 | free_irq(pdev->irq, host); | 1736 | free_irq(pdev->irq, host); |
1741 | carm_free_disks(host); | 1737 | carm_free_disks(host); |
1742 | devfs_remove(DRV_NAME); | ||
1743 | unregister_blkdev(host->major, host->name); | 1738 | unregister_blkdev(host->major, host->name); |
1744 | if (host->major == 160) | 1739 | if (host->major == 160) |
1745 | clear_bit(0, &carm_major_alloc); | 1740 | clear_bit(0, &carm_major_alloc); |