ide: IDE_AFLAG_MEDIA_CHANGED -> IDE_DFLAG_MEDIA_CHANGED

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>

3 files changed, 8 insertions, 8 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 3308b1cd3a33..7dc1a17a4dd8 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -99,7 +99,7 @@ static void ide_cd_put(struct cdrom_info *cd)
 /* Mark that we've seen a media change and invalidate our internal buffers. */
 static void cdrom_saw_media_change(ide_drive_t *drive)
 {
-        drive->atapi_flags |= IDE_AFLAG_MEDIA_CHANGED;
+        drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED;
         drive->atapi_flags &= ~IDE_AFLAG_TOC_VALID;
 }
 
@@ -1986,8 +1986,8 @@ static int ide_cdrom_setup(ide_drive_t *drive)
         if (!drive->queue->unplug_delay)
                 drive->queue->unplug_delay = 1;
 
-        drive->atapi_flags = IDE_AFLAG_MEDIA_CHANGED | IDE_AFLAG_NO_EJECT |
-                       ide_cd_flags(id);
+        drive->dev_flags |= IDE_DFLAG_MEDIA_CHANGED;
+        drive->atapi_flags = IDE_AFLAG_NO_EJECT | ide_cd_flags(id);
 
         if ((drive->atapi_flags & IDE_AFLAG_VERTOS_300_SSD) &&
             fw_rev[4] == '1' && fw_rev[6] <= '2')
diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c
index 74231b41f611..37d89ead13dd 100644
--- a/drivers/ide/ide-cd_ioctl.c
+++ b/drivers/ide/ide-cd_ioctl.c
@@ -86,8 +86,8 @@ int ide_cdrom_check_media_change_real(struct cdrom_device_info *cdi,
 
         if (slot_nr == CDSL_CURRENT) {
                 (void) cdrom_check_status(drive, NULL);
-                retval = (drive->atapi_flags & IDE_AFLAG_MEDIA_CHANGED) ? 1 : 0;
-                drive->atapi_flags &= ~IDE_AFLAG_MEDIA_CHANGED;
+                retval = (drive->dev_flags & IDE_DFLAG_MEDIA_CHANGED) ? 1 : 0;
+                drive->dev_flags &= ~IDE_DFLAG_MEDIA_CHANGED;
                 return retval;
         } else {
                 return -EINVAL;
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 3271e56d091c..df410c7191ac 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -689,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;
@@ -747,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;
 }