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

Commit 852738f3 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: convert "empty" REQ_TYPE_ATA_CMD requests to use REQ_TYPE_ATA_TASKFILE 



Based on the previous work by Tejun Heo.

There should be no functionality changes caused by this patch.

Cc: Tejun Heo <htejun@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 145b75e9

drivers/ide/ide-disk.c

+3 −1
Original line number Diff line number Diff line
@@ -620,8 +620,10 @@ static int set_multcount(ide_drive_t *drive, int arg) 


	if (drive->special.b.set_multmode)

		return -EBUSY;



	ide_init_drive_cmd (&rq);

	rq.cmd_type = REQ_TYPE_ATA_CMD;

	rq.cmd_type = REQ_TYPE_ATA_TASKFILE;



	drive->mult_req = arg;

	drive->special.b.set_multmode = 1;

	(void) ide_do_drive_cmd (drive, &rq, ide_wait);

drivers/ide/ide-taskfile.c

+1 −1
Original line number Diff line number Diff line
@@ -781,7 +781,7 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg) 
		struct request rq;



		ide_init_drive_cmd(&rq);

		rq.cmd_type = REQ_TYPE_ATA_CMD;

		rq.cmd_type = REQ_TYPE_ATA_TASKFILE;



		return ide_do_drive_cmd(drive, &rq, ide_wait);

	}

drivers/ide/ide.c

+1 −1
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ int set_pio_mode(ide_drive_t *drive, int arg) 
		return -EBUSY;



	ide_init_drive_cmd(&rq);

	rq.cmd_type = REQ_TYPE_ATA_CMD;

	rq.cmd_type = REQ_TYPE_ATA_TASKFILE;



	drive->tune_req = (u8) arg;

	drive->special.b.set_tune = 1;