ide: remove ide_task_t typedef
While at it:
- rename struct ide_task_s to struct ide_cmd
- remove stale comments from idedisk_{read_native,set}_max_address()
- drop unused 'cmd' argument from ide_{cmd,task}_ioctl()
- drop unused 'task' argument from tx4939ide_tf_load_fixup()
- rename ide_complete_task() to ide_complete_cmd()
- use consistent naming for struct ide_cmd variables
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
@@ -435,7 +435,7 @@ static int tx4939ide_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
|
||||
return ide_allocate_dma_engine(hwif);
|
||||
}
|
||||
|
||||
static void tx4939ide_tf_load_fixup(ide_drive_t *drive, ide_task_t *task)
|
||||
static void tx4939ide_tf_load_fixup(ide_drive_t *drive)
|
||||
{
|
||||
ide_hwif_t *hwif = drive->hwif;
|
||||
void __iomem *base = TX4939IDE_BASE(hwif);
|
||||
@@ -463,59 +463,59 @@ static void tx4939ide_outb(u8 value, unsigned long port)
|
||||
__raw_writeb(value, (void __iomem *)port);
|
||||
}
|
||||
|
||||
static void tx4939ide_tf_load(ide_drive_t *drive, ide_task_t *task)
|
||||
static void tx4939ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
{
|
||||
ide_hwif_t *hwif = drive->hwif;
|
||||
struct ide_io_ports *io_ports = &hwif->io_ports;
|
||||
struct ide_taskfile *tf = &task->tf;
|
||||
u8 HIHI = task->tf_flags & IDE_TFLAG_LBA48 ? 0xE0 : 0xEF;
|
||||
struct ide_taskfile *tf = &cmd->tf;
|
||||
u8 HIHI = cmd->tf_flags & IDE_TFLAG_LBA48 ? 0xE0 : 0xEF;
|
||||
|
||||
if (task->ftf_flags & IDE_FTFLAG_FLAGGED)
|
||||
if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)
|
||||
HIHI = 0xFF;
|
||||
|
||||
if (task->ftf_flags & IDE_FTFLAG_OUT_DATA) {
|
||||
if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {
|
||||
u16 data = (tf->hob_data << 8) | tf->data;
|
||||
|
||||
/* no endian swap */
|
||||
__raw_writew(data, (void __iomem *)io_ports->data_addr);
|
||||
}
|
||||
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
|
||||
tx4939ide_outb(tf->hob_feature, io_ports->feature_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)
|
||||
tx4939ide_outb(tf->hob_nsect, io_ports->nsect_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAL)
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAL)
|
||||
tx4939ide_outb(tf->hob_lbal, io_ports->lbal_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAM)
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAM)
|
||||
tx4939ide_outb(tf->hob_lbam, io_ports->lbam_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_HOB_LBAH)
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAH)
|
||||
tx4939ide_outb(tf->hob_lbah, io_ports->lbah_addr);
|
||||
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_FEATURE)
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_FEATURE)
|
||||
tx4939ide_outb(tf->feature, io_ports->feature_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_NSECT)
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_NSECT)
|
||||
tx4939ide_outb(tf->nsect, io_ports->nsect_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_LBAL)
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_LBAL)
|
||||
tx4939ide_outb(tf->lbal, io_ports->lbal_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_LBAM)
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_LBAM)
|
||||
tx4939ide_outb(tf->lbam, io_ports->lbam_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_LBAH)
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_LBAH)
|
||||
tx4939ide_outb(tf->lbah, io_ports->lbah_addr);
|
||||
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_DEVICE) {
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_DEVICE) {
|
||||
tx4939ide_outb((tf->device & HIHI) | drive->select,
|
||||
io_ports->device_addr);
|
||||
tx4939ide_tf_load_fixup(drive, task);
|
||||
tx4939ide_tf_load_fixup(drive);
|
||||
}
|
||||
}
|
||||
|
||||
static void tx4939ide_tf_read(ide_drive_t *drive, ide_task_t *task)
|
||||
static void tx4939ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
{
|
||||
ide_hwif_t *hwif = drive->hwif;
|
||||
struct ide_io_ports *io_ports = &hwif->io_ports;
|
||||
struct ide_taskfile *tf = &task->tf;
|
||||
struct ide_taskfile *tf = &cmd->tf;
|
||||
|
||||
if (task->ftf_flags & IDE_FTFLAG_IN_DATA) {
|
||||
if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {
|
||||
u16 data;
|
||||
|
||||
/* no endian swap */
|
||||
@@ -527,32 +527,32 @@ static void tx4939ide_tf_read(ide_drive_t *drive, ide_task_t *task)
|
||||
/* be sure we're looking at the low order bits */
|
||||
tx4939ide_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);
|
||||
|
||||
if (task->tf_flags & IDE_TFLAG_IN_FEATURE)
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
|
||||
tf->feature = tx4939ide_inb(io_ports->feature_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_IN_NSECT)
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)
|
||||
tf->nsect = tx4939ide_inb(io_ports->nsect_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_IN_LBAL)
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)
|
||||
tf->lbal = tx4939ide_inb(io_ports->lbal_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_IN_LBAM)
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_LBAM)
|
||||
tf->lbam = tx4939ide_inb(io_ports->lbam_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_IN_LBAH)
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_LBAH)
|
||||
tf->lbah = tx4939ide_inb(io_ports->lbah_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_IN_DEVICE)
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_DEVICE)
|
||||
tf->device = tx4939ide_inb(io_ports->device_addr);
|
||||
|
||||
if (task->tf_flags & IDE_TFLAG_LBA48) {
|
||||
if (cmd->tf_flags & IDE_TFLAG_LBA48) {
|
||||
tx4939ide_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);
|
||||
|
||||
if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
|
||||
tf->hob_feature =
|
||||
tx4939ide_inb(io_ports->feature_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)
|
||||
tf->hob_nsect = tx4939ide_inb(io_ports->nsect_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)
|
||||
tf->hob_lbal = tx4939ide_inb(io_ports->lbal_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)
|
||||
tf->hob_lbam = tx4939ide_inb(io_ports->lbam_addr);
|
||||
if (task->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
|
||||
if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)
|
||||
tf->hob_lbah = tx4939ide_inb(io_ports->lbah_addr);
|
||||
}
|
||||
}
|
||||
@@ -599,11 +599,12 @@ static const struct ide_tp_ops tx4939ide_tp_ops = {
|
||||
|
||||
#else /* __LITTLE_ENDIAN */
|
||||
|
||||
static void tx4939ide_tf_load(ide_drive_t *drive, ide_task_t *task)
|
||||
static void tx4939ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
{
|
||||
ide_tf_load(drive, task);
|
||||
if (task->tf_flags & IDE_TFLAG_OUT_DEVICE)
|
||||
tx4939ide_tf_load_fixup(drive, task);
|
||||
ide_tf_load(drive, cmd);
|
||||
|
||||
if (cmd->tf_flags & IDE_TFLAG_OUT_DEVICE)
|
||||
tx4939ide_tf_load_fixup(drive);
|
||||
}
|
||||
|
||||
static const struct ide_tp_ops tx4939ide_tp_ops = {
|
||||
|
||||
مرجع در شماره جدید
Block a user