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

Commit c96a7df8 authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-floppy: fold idefloppy_create_test_unit_ready_cmd into idefloppy_open 



There's no need for this function since it is used only once.

[bart: ported it over IDE changes]

Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 7fcebda5

drivers/ide/ide-floppy.c

+3 −7
Original line number Diff line number Diff line
@@ -561,12 +561,6 @@ static void idefloppy_create_start_stop_cmd(struct ide_atapi_pc *pc, int start) 
	pc->c[4] = start;

}



static void idefloppy_create_test_unit_ready_cmd(struct ide_atapi_pc *pc)

{

	idefloppy_init_pc(pc);

	pc->c[0] = GPCMD_TEST_UNIT_READY;

}



static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,

				    struct ide_atapi_pc *pc, struct request *rq,

				    unsigned long sector)
@@ -1166,7 +1160,9 @@ static int idefloppy_open(struct inode *inode, struct file *filp) 
		floppy->flags &= ~IDEFLOPPY_FLAG_FORMAT_IN_PROGRESS;

		/* Just in case */



		idefloppy_create_test_unit_ready_cmd(&pc);

		idefloppy_init_pc(&pc);

		pc.c[0] = GPCMD_TEST_UNIT_READY;



		if (idefloppy_queue_pc_tail(drive, &pc)) {

			idefloppy_create_start_stop_cmd(&pc, 1);

			(void) idefloppy_queue_pc_tail(drive, &pc);