ide: IDE_AFLAG_FORMAT_IN_PROGRESS -> IDE_DFLAG_FORMAT_IN_PROGRESS

There should be no functional changes caused by this patch.

Acked-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 8078e0826cd3..2cf98b531fd9 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -664,7 +664,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
         floppy->openers++;
 
         if (floppy->openers == 1) {
-                drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
+                drive->dev_flags &= ~IDE_DFLAG_FORMAT_IN_PROGRESS;
                 /* Just in case */
 
                 if (ide_do_test_unit_ready(drive, disk))
@@ -692,7 +692,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
                 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) {
+        } else if (drive->dev_flags & IDE_DFLAG_FORMAT_IN_PROGRESS) {
                 ret = -EBUSY;
                 goto out_put_floppy;
         }
@@ -714,7 +714,7 @@ static int idefloppy_release(struct inode *inode, struct file *filp)
 
         if (floppy->openers == 1) {
                 ide_set_media_lock(drive, disk, 0);
-                drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
+                drive->dev_flags &= ~IDE_DFLAG_FORMAT_IN_PROGRESS;
         }
 
         floppy->openers--;
diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c
index a3a7a0809e2b..b1f391df6cca 100644
--- a/drivers/ide/ide-floppy_ioctl.c
+++ b/drivers/ide/ide-floppy_ioctl.c
@@ -138,11 +138,11 @@ static int ide_floppy_format_unit(ide_drive_t *drive, int __user *arg)
 
         if (floppy->openers > 1) {
                 /* Don't format if someone is using the disk */
-                drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
+                drive->dev_flags &= ~IDE_DFLAG_FORMAT_IN_PROGRESS;
                 return -EBUSY;
         }
 
-        drive->atapi_flags |= IDE_AFLAG_FORMAT_IN_PROGRESS;
+        drive->dev_flags |= IDE_DFLAG_FORMAT_IN_PROGRESS;
 
         /*
          * Send ATAPI_FORMAT_UNIT to the drive.
@@ -174,7 +174,7 @@ static int ide_floppy_format_unit(ide_drive_t *drive, int __user *arg)
 
 out:
         if (err)
-                drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
+                drive->dev_flags &= ~IDE_DFLAG_FORMAT_IN_PROGRESS;
         return err;
 }