ide: IDE_AFLAG_MEDIA_CHANGED -> IDE_DFLAG_MEDIA_CHANGED

[linux-2.6-omap-h63xx.git] / drivers / ide / ide-floppy.c

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index cf0aa25470ee87368291dbf8614d2b67020315e9..df410c7191ac66081c9acdc4936e7a12ca6cc6f7 100644 (file)
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -445,7 +445,9 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
                        drive->name, lba_capacity, capacity);
                floppy->blocks = floppy->block_size ?
                        capacity / floppy->block_size : 0;
+               drive->capacity64 = floppy->blocks * floppy->bs_factor;
        }
+
        return 0;
 }
 
@@ -466,7 +468,7 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
        drive->bios_head = drive->bios_sect = 0;
        floppy->blocks = 0;
        floppy->bs_factor = 1;
-       set_capacity(floppy->disk, 0);
+       drive->capacity64 = 0;
 
        ide_floppy_create_read_capacity_cmd(&pc);
        if (ide_queue_pc_tail(drive, disk, &pc)) {
@@ -523,6 +525,8 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
                                               "non 512 bytes block size not "
                                               "fully supported\n",
                                               drive->name);
+                               drive->capacity64 =
+                                       floppy->blocks * floppy->bs_factor;
                                rc = 0;
                        }
                        break;
@@ -547,21 +551,17 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
        if (!(drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE))
                (void) ide_floppy_get_flexible_disk_page(drive);
 
-       set_capacity(disk, floppy->blocks * floppy->bs_factor);
-
        return rc;
 }
 
 sector_t ide_floppy_capacity(ide_drive_t *drive)
 {
-       idefloppy_floppy_t *floppy = drive->driver_data;
-       unsigned long capacity = floppy->blocks * floppy->bs_factor;
-
-       return capacity;
+       return drive->capacity64;
 }
 
-static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)
+static void idefloppy_setup(ide_drive_t *drive)
 {
+       struct ide_floppy_obj *floppy = drive->driver_data;
        u16 *id = drive->id;
 
        drive->pc_callback       = ide_floppy_callback;
@@ -598,6 +598,8 @@ static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)
        (void) ide_floppy_get_capacity(drive);
 
        ide_proc_register_driver(drive, floppy->driver);
+
+       drive->dev_flags |= IDE_DFLAG_ATTACH;
 }
 
 static void ide_floppy_remove(ide_drive_t *drive)
@@ -668,14 +670,16 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
                if (ide_do_test_unit_ready(drive, disk))
                        ide_do_start_stop(drive, disk, 1);
 
-               if (ide_floppy_get_capacity(drive)
-                  && (filp->f_flags & O_NDELAY) == 0
+               ret = ide_floppy_get_capacity(drive);
+
+               set_capacity(disk, ide_floppy_capacity(drive));
+
+               if (ret && (filp->f_flags & O_NDELAY) == 0) {
                    /*
                     * Allow O_NDELAY to open a drive without a disk, or with an
                     * unreadable disk, so that we can get the format capacity
                     * of the drive or begin the format - Sam
                     */
-                   ) {
                        ret = -EIO;
                        goto out_put_floppy;
                }
@@ -685,8 +689,8 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
                        goto out_put_floppy;
                }
 
-               drive->atapi_flags |= IDE_AFLAG_MEDIA_CHANGED;
                ide_set_media_lock(drive, disk, 1);
+               drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED;
                check_disk_change(inode->i_bdev);
        } else if (drive->atapi_flags & IDE_AFLAG_FORMAT_IN_PROGRESS) {
                ret = -EBUSY;
@@ -743,8 +747,8 @@ static int idefloppy_media_changed(struct gendisk *disk)
                drive->dev_flags &= ~IDE_DFLAG_ATTACH;
                return 0;
        }
-       ret = !!(drive->atapi_flags & IDE_AFLAG_MEDIA_CHANGED);
-       drive->atapi_flags &= ~IDE_AFLAG_MEDIA_CHANGED;
+       ret = !!(drive->dev_flags & IDE_DFLAG_MEDIA_CHANGED);
+       drive->dev_flags &= ~IDE_DFLAG_MEDIA_CHANGED;
        return ret;
 }
 
@@ -788,7 +792,7 @@ static int ide_floppy_probe(ide_drive_t *drive)
                goto failed;
        }
 
-       g = alloc_disk(1 << PARTN_BITS);
+       g = alloc_disk_node(1 << PARTN_BITS, hwif_to_node(drive->hwif));
        if (!g)
                goto out_free_floppy;
 
@@ -806,8 +810,9 @@ static int ide_floppy_probe(ide_drive_t *drive)
 
        drive->debug_mask = debug_mask;
 
-       idefloppy_setup(drive, floppy);
-       drive->dev_flags |= IDE_DFLAG_ATTACH;
+       idefloppy_setup(drive);
+
+       set_capacity(g, ide_floppy_capacity(drive));
 
        g->minors = 1 << PARTN_BITS;
        g->driverfs_dev = &drive->gendev;