Messages in this thread Patch in this message | | | From | Herton Ronaldo Krzesinski <> | Subject | [PATCH 6/6] floppy: use disk_registered for checking if a drive is present | Date | Thu, 9 Aug 2012 16:59:51 -0300 |
| |
Simplify/cleanup code, replacing remaining checks for drives present using disk_registered array.
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> --- drivers/block/floppy.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 438ffc9..5fcc2a1 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4114,9 +4114,7 @@ static struct platform_device floppy_device[N_DRIVE]; static struct kobject *floppy_find(dev_t dev, int *part, void *data) { int drive = (*part & 3) | ((*part & 0x80) >> 5); - if (drive >= N_DRIVE || - !(allowed_drive_mask & (1 << drive)) || - fdc_state[FDC(drive)].version == FDC_NONE) + if (drive >= N_DRIVE || !disk_registered[drive]) return NULL; if (((*part >> 2) & 0x1f) >= ARRAY_SIZE(floppy_type)) return NULL; @@ -4559,8 +4557,7 @@ static void __exit floppy_module_exit(void) for (drive = 0; drive < N_DRIVE; drive++) { del_timer_sync(&motor_off_timer[drive]); - if ((allowed_drive_mask & (1 << drive)) && - fdc_state[FDC(drive)].version != FDC_NONE) { + if (disk_registered[drive]) { del_gendisk(disks[drive]); device_remove_file(&floppy_device[drive].dev, &dev_attr_cmos); platform_device_unregister(&floppy_device[drive]); @@ -4571,8 +4568,7 @@ static void __exit floppy_module_exit(void) * These disks have not called add_disk(). Don't put down * queue reference in put_disk(). */ - if (!(allowed_drive_mask & (1 << drive)) || - fdc_state[FDC(drive)].version == FDC_NONE) + if (!disk_registered[drive]) disks[drive]->queue = NULL; put_disk(disks[drive]); -- 1.7.9.5
| |