diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-21 00:15:16 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 15:25:06 -0400 |
commit | 94f6c59dcf16f10a20fbe3d1f098b159433f94bd (patch) | |
tree | 06ec8cdb07de07389aa80fb394724ac07615a887 /drivers/ide/ide-probe.c | |
parent | aa4148cfc7b3b93eeaf755a7d14f10afaffe9a96 (diff) |
[PATCH] devfs: Remove devfs support from the ide subsystem.
Also removes the ide drive devfs_name field as it's no longer needed
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 9ebf8ae2a5e3..0d5038a28560 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <linux/slab.h> | 47 | #include <linux/slab.h> |
48 | #include <linux/delay.h> | 48 | #include <linux/delay.h> |
49 | #include <linux/ide.h> | 49 | #include <linux/ide.h> |
50 | #include <linux/devfs_fs_kernel.h> | ||
51 | #include <linux/spinlock.h> | 50 | #include <linux/spinlock.h> |
52 | #include <linux/kmod.h> | 51 | #include <linux/kmod.h> |
53 | #include <linux/pci.h> | 52 | #include <linux/pci.h> |
@@ -1279,10 +1278,6 @@ static void drive_release_dev (struct device *dev) | |||
1279 | ide_drive_t *drive = container_of(dev, ide_drive_t, gendev); | 1278 | ide_drive_t *drive = container_of(dev, ide_drive_t, gendev); |
1280 | 1279 | ||
1281 | spin_lock_irq(&ide_lock); | 1280 | spin_lock_irq(&ide_lock); |
1282 | if (drive->devfs_name[0] != '\0') { | ||
1283 | devfs_remove(drive->devfs_name); | ||
1284 | drive->devfs_name[0] = '\0'; | ||
1285 | } | ||
1286 | ide_remove_drive_from_hwgroup(drive); | 1281 | ide_remove_drive_from_hwgroup(drive); |
1287 | kfree(drive->id); | 1282 | kfree(drive->id); |
1288 | drive->id = NULL; | 1283 | drive->id = NULL; |
@@ -1316,12 +1311,6 @@ static void init_gendisk (ide_hwif_t *hwif) | |||
1316 | drive->gendev.bus = &ide_bus_type; | 1311 | drive->gendev.bus = &ide_bus_type; |
1317 | drive->gendev.driver_data = drive; | 1312 | drive->gendev.driver_data = drive; |
1318 | drive->gendev.release = drive_release_dev; | 1313 | drive->gendev.release = drive_release_dev; |
1319 | if (drive->present) { | ||
1320 | sprintf(drive->devfs_name, "ide/host%d/bus%d/target%d/lun%d", | ||
1321 | (hwif->channel && hwif->mate) ? | ||
1322 | hwif->mate->index : hwif->index, | ||
1323 | hwif->channel, unit, drive->lun); | ||
1324 | } | ||
1325 | } | 1314 | } |
1326 | blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS, | 1315 | blk_register_region(MKDEV(hwif->major, 0), MAX_DRIVES << PARTN_BITS, |
1327 | THIS_MODULE, ata_probe, ata_lock, hwif); | 1316 | THIS_MODULE, ata_probe, ata_lock, hwif); |