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

Commit 5efe7c54 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove set_transfer() 



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

drivers/ide/ide-iops.c

+0 −18
Original line number Original line Diff line number Diff line
@@ -627,24 +627,6 @@ int ide_ata66_check (ide_drive_t *drive, ide_task_t *args) 
	return 0;

	return 0;

}

}





/*

 * Backside of HDIO_DRIVE_CMD call of SETFEATURES_XFER.

 * 1 : Safe to update drive->id DMA registers.

 * 0 : OOPs not allowed.

 */

int set_transfer (ide_drive_t *drive, ide_task_t *args)

{

	if (args->tf.command == WIN_SETFEATURES &&

	    args->tf.nsect >= XFER_SW_DMA_0 &&

	    args->tf.feature == SETFEATURES_XFER &&

	    (drive->id->dma_ultra ||

	     drive->id->dma_mword ||

	     drive->id->dma_1word))

		return 1;



	return 0;

}



#ifdef CONFIG_BLK_DEV_IDEDMA

#ifdef CONFIG_BLK_DEV_IDEDMA

static u8 ide_auto_reduce_xfer (ide_drive_t *drive)

static u8 ide_auto_reduce_xfer (ide_drive_t *drive)

{

{

drivers/ide/ide-taskfile.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -755,6 +755,7 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg) 
	u8 args[4], xfer_rate = 0;

	u8 args[4], xfer_rate = 0;

	ide_task_t tfargs;

	ide_task_t tfargs;

	struct ide_taskfile *tf = &tfargs.tf;

	struct ide_taskfile *tf = &tfargs.tf;

	struct hd_driveid *id = drive->id;





	if (NULL == (void *) arg) {

	if (NULL == (void *) arg) {

		struct request rq;

		struct request rq;
@@ -792,7 +793,10 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg) 
			return -ENOMEM;

			return -ENOMEM;

	}

	}





	if (set_transfer(drive, &tfargs)) {

	if (tf->command == WIN_SETFEATURES &&

	    tf->feature == SETFEATURES_XFER &&

	    tf->nsect >= XFER_SW_DMA_0 &&

	    (id->dma_ultra || id->dma_mword || id->dma_1word)) {

		xfer_rate = args[1];

		xfer_rate = args[1];

		if (ide_ata66_check(drive, &tfargs))

		if (ide_ata66_check(drive, &tfargs))

			goto abort;

			goto abort;

include/linux/ide.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -991,7 +991,6 @@ extern int ide_driveid_update(ide_drive_t *); 
extern int ide_ata66_check(ide_drive_t *, ide_task_t *);

extern int ide_ata66_check(ide_drive_t *, ide_task_t *);

extern int ide_config_drive_speed(ide_drive_t *, u8);

extern int ide_config_drive_speed(ide_drive_t *, u8);

extern u8 eighty_ninty_three (ide_drive_t *);

extern u8 eighty_ninty_three (ide_drive_t *);

extern int set_transfer(ide_drive_t *, ide_task_t *);

extern int taskfile_lib_get_identify(ide_drive_t *drive, u8 *);

extern int taskfile_lib_get_identify(ide_drive_t *drive, u8 *);





extern int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout);

extern int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout);