mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
ide: remove set_transfer()
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
fa017176f7
commit
5efe7c540e
3 changed files with 5 additions and 20 deletions
|
@ -627,24 +627,6 @@ int ide_ata66_check (ide_drive_t *drive, ide_task_t *args)
|
|||
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
|
||||
static u8 ide_auto_reduce_xfer (ide_drive_t *drive)
|
||||
{
|
||||
|
|
|
@ -755,6 +755,7 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
|
|||
u8 args[4], xfer_rate = 0;
|
||||
ide_task_t tfargs;
|
||||
struct ide_taskfile *tf = &tfargs.tf;
|
||||
struct hd_driveid *id = drive->id;
|
||||
|
||||
if (NULL == (void *) arg) {
|
||||
struct request rq;
|
||||
|
@ -792,7 +793,10 @@ int ide_cmd_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
|
|||
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];
|
||||
if (ide_ata66_check(drive, &tfargs))
|
||||
goto abort;
|
||||
|
|
|
@ -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_config_drive_speed(ide_drive_t *, u8);
|
||||
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 ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout);
|
||||
|
|
Loading…
Reference in a new issue