Commit fe11edfa authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: IDE_AFLAG_MEDIA_CHANGED -> IDE_DFLAG_MEDIA_CHANGED 



There should be no functional changes caused by this patch.

Acked-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 6f84083b

drivers/ide/ide-cd.c

+3 −3
Original line number Diff line number Diff line
@@ -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')

drivers/ide/ide-cd_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/ide/ide-floppy.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}

include/linux/ide.h

+2 −2
Original line number Diff line number Diff line
@@ -464,7 +464,6 @@ struct ide_acpi_hwif_link; 
/* ATAPI device flags */

enum {

	IDE_AFLAG_DRQ_INTERRUPT		= (1 << 0),

	IDE_AFLAG_MEDIA_CHANGED		= (1 << 1),

	/* Drive cannot lock the door. */

	IDE_AFLAG_NO_DOORLOCK		= (1 << 2),
@@ -578,7 +577,8 @@ enum { 
	/* don't unload heads */

	IDE_DFLAG_NO_UNLOAD		= (1 << 27),

	/* heads unloaded, please don't reset port */

	IDE_DFLAG_PARKED		= (1 << 28)

	IDE_DFLAG_PARKED		= (1 << 28),

	IDE_DFLAG_MEDIA_CHANGED		= (1 << 29),

};



struct ide_drive_s {