Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

ide-floppy: add ide_floppy_set_media_lock() helper 



Add ide_floppy_set_media_lock() helper and convert idefloppy_open(),
idefloppy_release() and ide_floppy_lockdoor() to use it.

There should be no functional changes caused by this patch.

Acked-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent acaa0f5f

drivers/ide/ide-floppy.c

+16 −23
Original line number Original line Diff line number Diff line
@@ -1038,6 +1038,17 @@ static ide_driver_t idefloppy_driver = { 
#endif

#endif

};

};





static void ide_floppy_set_media_lock(ide_drive_t *drive, int on)

{

	struct ide_atapi_pc pc;



	/* IOMEGA Clik! drives do not support lock/unlock commands */

	if ((drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE) == 0) {

		idefloppy_create_prevent_cmd(&pc, on);

		(void)idefloppy_queue_pc_tail(drive, &pc);

	}

}



static int idefloppy_open(struct inode *inode, struct file *filp)

static int idefloppy_open(struct inode *inode, struct file *filp)

{

{

	struct gendisk *disk = inode->i_bdev->bd_disk;

	struct gendisk *disk = inode->i_bdev->bd_disk;
@@ -1084,12 +1095,9 @@ static int idefloppy_open(struct inode *inode, struct file *filp) 
			ret = -EROFS;

			ret = -EROFS;

			goto out_put_floppy;

			goto out_put_floppy;

		}

		}



		drive->atapi_flags |= IDE_AFLAG_MEDIA_CHANGED;

		drive->atapi_flags |= IDE_AFLAG_MEDIA_CHANGED;

		/* IOMEGA Clik! drives do not support lock/unlock commands */

		ide_floppy_set_media_lock(drive, 1);

		if (!(drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE)) {

			idefloppy_create_prevent_cmd(&pc, 1);

			(void) idefloppy_queue_pc_tail(drive, &pc);

		}

		check_disk_change(inode->i_bdev);

		check_disk_change(inode->i_bdev);

	} else if (drive->atapi_flags & IDE_AFLAG_FORMAT_IN_PROGRESS) {

	} else if (drive->atapi_flags & IDE_AFLAG_FORMAT_IN_PROGRESS) {

		ret = -EBUSY;

		ret = -EBUSY;
@@ -1108,17 +1116,11 @@ static int idefloppy_release(struct inode *inode, struct file *filp) 
	struct gendisk *disk = inode->i_bdev->bd_disk;

	struct gendisk *disk = inode->i_bdev->bd_disk;

	struct ide_floppy_obj *floppy = ide_floppy_g(disk);

	struct ide_floppy_obj *floppy = ide_floppy_g(disk);

	ide_drive_t *drive = floppy->drive;

	ide_drive_t *drive = floppy->drive;

	struct ide_atapi_pc pc;





	debug_log("Reached %s\n", __func__);

	debug_log("Reached %s\n", __func__);





	if (floppy->openers == 1) {

	if (floppy->openers == 1) {

		/* IOMEGA Clik! drives do not support lock/unlock commands */

		ide_floppy_set_media_lock(drive, 0);

		if (!(drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE)) {

			idefloppy_create_prevent_cmd(&pc, 0);

			(void) idefloppy_queue_pc_tail(drive, &pc);

		}



		drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;

		drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;

	}

	}
@@ -1144,21 +1146,12 @@ static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc, 
			       unsigned long arg, unsigned int cmd)

			       unsigned long arg, unsigned int cmd)

{

{

	idefloppy_floppy_t *floppy = drive->driver_data;

	idefloppy_floppy_t *floppy = drive->driver_data;

	int prevent = (arg && cmd != CDROMEJECT) ? 1 : 0;





	if (floppy->openers > 1)

	if (floppy->openers > 1)

		return -EBUSY;

		return -EBUSY;





	/* The IOMEGA Clik! Drive doesn't support this command -

	ide_floppy_set_media_lock(drive, prevent);

	 * no room for an eject mechanism */

	if (!(drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE)) {

		int prevent = arg ? 1 : 0;



		if (cmd == CDROMEJECT)

			prevent = 0;



		idefloppy_create_prevent_cmd(pc, prevent);

		(void) idefloppy_queue_pc_tail(floppy->drive, pc);

	}





	if (cmd == CDROMEJECT) {

	if (cmd == CDROMEJECT) {

		idefloppy_create_start_stop_cmd(pc, 2);

		idefloppy_create_start_stop_cmd(pc, 2);