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

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

ide: add ide_do_test_unit_ready() helper 



* Add ide_do_test_unit_ready() helper and convert ide-{floppy,tape}.c
  to use it.

* Remove no longer used idetape_create_test_unit_ready_cmd().

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 0c8a6c7a

drivers/ide/ide-atapi.c

+11 −0
Original line number Diff line number Diff line
@@ -162,6 +162,17 @@ int ide_queue_pc_tail(ide_drive_t *drive, struct gendisk *disk, 
}

EXPORT_SYMBOL_GPL(ide_queue_pc_tail);



int ide_do_test_unit_ready(ide_drive_t *drive, struct gendisk *disk)

{

	struct ide_atapi_pc pc;



	ide_init_pc(&pc);

	pc.c[0] = TEST_UNIT_READY;



	return ide_queue_pc_tail(drive, disk, &pc);

}

EXPORT_SYMBOL_GPL(ide_do_test_unit_ready);



int ide_do_start_stop(ide_drive_t *drive, struct gendisk *disk, int start)

{

	struct ide_atapi_pc pc;

drivers/ide/ide-floppy.c

+1 −5
Original line number Diff line number Diff line
@@ -773,7 +773,6 @@ static int idefloppy_open(struct inode *inode, struct file *filp) 
	struct gendisk *disk = inode->i_bdev->bd_disk;

	struct ide_floppy_obj *floppy;

	ide_drive_t *drive;

	struct ide_atapi_pc pc;

	int ret = 0;



	debug_log("Reached %s\n", __func__);
@@ -790,10 +789,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp) 
		drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;

		/* Just in case */



		ide_init_pc(&pc);

		pc.c[0] = GPCMD_TEST_UNIT_READY;



		if (ide_queue_pc_tail(drive, disk, &pc))

		if (ide_do_test_unit_ready(drive, disk))

			ide_do_start_stop(drive, disk, 1);



		if (ide_floppy_get_capacity(drive)

drivers/ide/ide-tape.c

+1 −9
Original line number Diff line number Diff line
@@ -1119,25 +1119,17 @@ static void idetape_create_write_filemark_cmd(ide_drive_t *drive, 
	pc->flags |= PC_FLAG_WAIT_FOR_DSC;

}



static void idetape_create_test_unit_ready_cmd(struct ide_atapi_pc *pc)

{

	ide_init_pc(pc);

	pc->c[0] = TEST_UNIT_READY;

}



static int idetape_wait_ready(ide_drive_t *drive, unsigned long timeout)

{

	idetape_tape_t *tape = drive->driver_data;

	struct gendisk *disk = tape->disk;

	struct ide_atapi_pc pc;

	int load_attempted = 0;



	/* Wait for the tape to become ready */

	set_bit(IDE_AFLAG_MEDIUM_PRESENT, &drive->atapi_flags);

	timeout += jiffies;

	while (time_before(jiffies, timeout)) {

		idetape_create_test_unit_ready_cmd(&pc);

		if (!ide_queue_pc_tail(drive, disk, &pc))

		if (ide_do_test_unit_ready(drive, disk) == 0)

			return 0;

		if ((tape->sense_key == 2 && tape->asc == 4 && tape->ascq == 2)

		    || (tape->asc == 0x3A)) {

include/linux/ide.h

+1 −0
Original line number Diff line number Diff line
@@ -1142,6 +1142,7 @@ void ide_queue_pc_head(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *, 
		       struct request *);

int ide_queue_pc_tail(ide_drive_t *, struct gendisk *, struct ide_atapi_pc *);



int ide_do_test_unit_ready(ide_drive_t *, struct gendisk *);

int ide_do_start_stop(ide_drive_t *, struct gendisk *, int);

int ide_set_media_lock(ide_drive_t *, struct gendisk *, int);