leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ide: add ide_no_data_taskfile() helper

Browse Source 
* Add ide_no_data_taskfile() helper and convert ide_raw_taskfile() w/ NO DATA
  protocol users to use it instead.

* Set ->data_phase explicitly in ide_no_data_taskfile()
  (TASKFILE_NO_DATA is defined as 0x0000).

* Unexport task_no_data_intr().

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-01-25 22:17:07 +01:00
parent 9e42237f26
commit 9a3c49be5c
4 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/ide/ide-acpi.c
View File

@ -383,9 +383,6 @@ static int taskfile_load_raw(ide_drive_t *drive,
gtf->tfa[3], gtf->tfa[4], gtf->tfa[5], gtf->tfa[6]); gtf->tfa[3], gtf->tfa[4], gtf->tfa[5], gtf->tfa[6]);
memset(&args, 0, sizeof(ide_task_t)); memset(&args, 0, sizeof(ide_task_t));
args.command_type = IDE_DRIVE_TASK_NO_DATA;
args.data_phase = TASKFILE_NO_DATA;
args.handler = &task_no_data_intr;
/* convert gtf to IDE Taskfile */ /* convert gtf to IDE Taskfile */
memcpy(&args.tf_array[7], &gtf->tfa, 7); memcpy(&args.tf_array[7], &gtf->tfa, 7);
@ -395,9 +392,9 @@ static int taskfile_load_raw(ide_drive_t *drive,
return err; return err;
} }
err = ide_raw_taskfile(drive, &args, NULL); err = ide_no_data_taskfile(drive, &args);
if (err) if (err)
printk(KERN_ERR "%s: ide_raw_taskfile failed: %u\n", printk(KERN_ERR "%s: ide_no_data_taskfile failed: %u\n",
__FUNCTION__, err); __FUNCTION__, err);
return err; return err;

32
drivers/ide/ide-disk.c
View File

@ -303,10 +303,8 @@ static u64 idedisk_read_native_max_address(ide_drive_t *drive, int lba48)
else else
tf->command = WIN_READ_NATIVE_MAX; tf->command = WIN_READ_NATIVE_MAX;
tf->device = ATA_LBA; tf->device = ATA_LBA;
args.command_type = IDE_DRIVE_TASK_NO_DATA;
args.handler = &task_no_data_intr;
/* submit command request */ /* submit command request */
ide_raw_taskfile(drive, &args, NULL); ide_no_data_taskfile(drive, &args);
/* if OK, compute maximum address value */ /* if OK, compute maximum address value */
if ((tf->status & 0x01) == 0) { if ((tf->status & 0x01) == 0) {
@ -350,10 +348,8 @@ static u64 idedisk_set_max_address(ide_drive_t *drive, u64 addr_req, int lba48)
tf->command = WIN_SET_MAX; tf->command = WIN_SET_MAX;
} }
tf->device |= ATA_LBA; tf->device |= ATA_LBA;
args.command_type = IDE_DRIVE_TASK_NO_DATA;
args.handler = &task_no_data_intr;
/* submit command request */ /* submit command request */
ide_raw_taskfile(drive, &args, NULL); ide_no_data_taskfile(drive, &args);
/* if OK, compute maximum address value */ /* if OK, compute maximum address value */
if ((tf->status & 0x01) == 0) { if ((tf->status & 0x01) == 0) {
u32 high, low; u32 high, low;
@ -500,9 +496,7 @@ static int smart_enable(ide_drive_t *drive)
tf->lbam = SMART_LCYL_PASS; tf->lbam = SMART_LCYL_PASS;
tf->lbah = SMART_HCYL_PASS; tf->lbah = SMART_HCYL_PASS;
tf->command = WIN_SMART; tf->command = WIN_SMART;
args.command_type = IDE_DRIVE_TASK_NO_DATA; return ide_no_data_taskfile(drive, &args);
args.handler = &task_no_data_intr;
return ide_raw_taskfile(drive, &args, NULL);
} }
static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd) static int get_smart_data(ide_drive_t *drive, u8 *buf, u8 sub_cmd)
@ -695,9 +689,7 @@ static int write_cache(ide_drive_t *drive, int arg)
args.tf.feature = arg ? args.tf.feature = arg ?
SETFEATURES_EN_WCACHE : SETFEATURES_DIS_WCACHE; SETFEATURES_EN_WCACHE : SETFEATURES_DIS_WCACHE;
args.tf.command = WIN_SETFEATURES; args.tf.command = WIN_SETFEATURES;
args.command_type = IDE_DRIVE_TASK_NO_DATA; err = ide_no_data_taskfile(drive, &args);
args.handler = &task_no_data_intr;
err = ide_raw_taskfile(drive, &args, NULL);
if (err == 0) if (err == 0)
drive->wcache = arg; drive->wcache = arg;
} }
@ -716,9 +708,7 @@ static int do_idedisk_flushcache (ide_drive_t *drive)
args.tf.command = WIN_FLUSH_CACHE_EXT; args.tf.command = WIN_FLUSH_CACHE_EXT;
else else
args.tf.command = WIN_FLUSH_CACHE; args.tf.command = WIN_FLUSH_CACHE;
args.command_type = IDE_DRIVE_TASK_NO_DATA; return ide_no_data_taskfile(drive, &args);
args.handler = &task_no_data_intr;
return ide_raw_taskfile(drive, &args, NULL);
} }
static int set_acoustic (ide_drive_t *drive, int arg) static int set_acoustic (ide_drive_t *drive, int arg)
@ -732,9 +722,7 @@ static int set_acoustic (ide_drive_t *drive, int arg)
args.tf.feature = arg ? SETFEATURES_EN_AAM : SETFEATURES_DIS_AAM; args.tf.feature = arg ? SETFEATURES_EN_AAM : SETFEATURES_DIS_AAM;
args.tf.nsect = arg; args.tf.nsect = arg;
args.tf.command = WIN_SETFEATURES; args.tf.command = WIN_SETFEATURES;
args.command_type = IDE_DRIVE_TASK_NO_DATA; ide_no_data_taskfile(drive, &args);
args.handler = &task_no_data_intr;
ide_raw_taskfile(drive, &args, NULL);
drive->acoustic = arg; drive->acoustic = arg;
return 0; return 0;
} }
@ -996,15 +984,13 @@ static int idedisk_open(struct inode *inode, struct file *filp)
ide_task_t args; ide_task_t args;
memset(&args, 0, sizeof(ide_task_t)); memset(&args, 0, sizeof(ide_task_t));
args.tf.command = WIN_DOORLOCK; args.tf.command = WIN_DOORLOCK;
args.command_type = IDE_DRIVE_TASK_NO_DATA;
args.handler = &task_no_data_intr;
check_disk_change(inode->i_bdev); check_disk_change(inode->i_bdev);
/* /*
* Ignore the return code from door_lock, * Ignore the return code from door_lock,
* since the open() has already succeeded, * since the open() has already succeeded,
* and the door_lock is irrelevant at this point. * and the door_lock is irrelevant at this point.
*/ */
if (drive->doorlocking && ide_raw_taskfile(drive, &args, NULL)) if (drive->doorlocking && ide_no_data_taskfile(drive, &args))
drive->doorlocking = 0; drive->doorlocking = 0;
} }
return 0; return 0;
@ -1023,9 +1009,7 @@ static int idedisk_release(struct inode *inode, struct file *filp)
ide_task_t args; ide_task_t args;
memset(&args, 0, sizeof(ide_task_t)); memset(&args, 0, sizeof(ide_task_t));
args.tf.command = WIN_DOORUNLOCK; args.tf.command = WIN_DOORUNLOCK;
args.command_type = IDE_DRIVE_TASK_NO_DATA; if (drive->doorlocking && ide_no_data_taskfile(drive, &args))
args.handler = &task_no_data_intr;
if (drive->doorlocking && ide_raw_taskfile(drive, &args, NULL))
drive->doorlocking = 0; drive->doorlocking = 0;
} }

12
drivers/ide/ide-taskfile.c
View File

@ -229,8 +229,6 @@ ide_startstop_t task_no_data_intr (ide_drive_t *drive)
return ide_stopped; return ide_stopped;
} }
EXPORT_SYMBOL(task_no_data_intr);
static u8 wait_drive_not_busy(ide_drive_t *drive) static u8 wait_drive_not_busy(ide_drive_t *drive)
{ {
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
@ -524,6 +522,16 @@ int ide_raw_taskfile (ide_drive_t *drive, ide_task_t *args, u8 *buf)
EXPORT_SYMBOL(ide_raw_taskfile); EXPORT_SYMBOL(ide_raw_taskfile);
int ide_no_data_taskfile(ide_drive_t *drive, ide_task_t *task)
{
task->command_type = IDE_DRIVE_TASK_NO_DATA;
task->data_phase = TASKFILE_NO_DATA;
task->handler = task_no_data_intr;
return ide_raw_taskfile(drive, task, NULL);
}
EXPORT_SYMBOL_GPL(ide_no_data_taskfile);
#ifdef CONFIG_IDE_TASK_IOCTL #ifdef CONFIG_IDE_TASK_IOCTL
int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg) int ide_taskfile_ioctl (ide_drive_t *drive, unsigned int cmd, unsigned long arg)
{ {

2
include/linux/ide.h
View File

@ -1140,6 +1140,8 @@ extern ide_startstop_t pre_task_out_intr(ide_drive_t *, struct request *);
extern int ide_raw_taskfile(ide_drive_t *, ide_task_t *, u8 *); extern int ide_raw_taskfile(ide_drive_t *, ide_task_t *, u8 *);
int ide_no_data_taskfile(ide_drive_t *, ide_task_t *);
int ide_taskfile_ioctl(ide_drive_t *, unsigned int, unsigned long); int ide_taskfile_ioctl(ide_drive_t *, unsigned int, unsigned long);
int ide_cmd_ioctl(ide_drive_t *, unsigned int, unsigned long); int ide_cmd_ioctl(ide_drive_t *, unsigned int, unsigned long);
int ide_task_ioctl(ide_drive_t *, unsigned int, unsigned long); int ide_task_ioctl(ide_drive_t *, unsigned int, unsigned long);