ide: add struct ide_tp_ops (take 2)
* Add struct ide_tp_ops for transport methods. * Add 'const struct ide_tp_ops *tp_ops' to struct ide_port_info and ide_hwif_t. * Set the default hwif->tp_ops in ide_init_port_data(). * Set host driver specific hwif->tp_ops in ide_init_port(). * Export ide_exec_command(), ide_read_status(), ide_read_altstatus(), ide_read_sff_dma_status(), ide_set_irq(), ide_tf_{load,read}() and ata_{in,out}put_data(). * Convert host drivers and core code to use struct ide_tp_ops. * Remove no longer needed default_hwif_transport(). * Cleanup ide_hwif_t from methods that are now in struct ide_tp_ops. While at it: * Use struct ide_port_info in falconide.c and q40ide.c. * Rename ata_{in,out}put_data() to ide_{in,out}put_data(). v2: * Fix missing convertion in ns87415.c. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
@@ -247,9 +247,9 @@ static void ide_floppy_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
|
||||
|
||||
data = bvec_kmap_irq(bvec, &flags);
|
||||
if (direction)
|
||||
hwif->output_data(drive, NULL, data, count);
|
||||
hwif->tp_ops->output_data(drive, NULL, data, count);
|
||||
else
|
||||
hwif->input_data(drive, NULL, data, count);
|
||||
hwif->tp_ops->input_data(drive, NULL, data, count);
|
||||
bvec_kunmap_irq(data, &flags);
|
||||
|
||||
bcount -= count;
|
||||
@@ -402,7 +402,7 @@ static int idefloppy_transfer_pc(ide_drive_t *drive)
|
||||
idefloppy_floppy_t *floppy = drive->driver_data;
|
||||
|
||||
/* Send the actual packet */
|
||||
drive->hwif->output_data(drive, NULL, floppy->pc->c, 12);
|
||||
drive->hwif->tp_ops->output_data(drive, NULL, floppy->pc->c, 12);
|
||||
|
||||
/* Timeout for the packet command */
|
||||
return IDEFLOPPY_WAIT_CMD;
|
||||
@@ -954,7 +954,7 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg)
|
||||
u8 stat;
|
||||
|
||||
local_irq_save(flags);
|
||||
stat = hwif->read_status(hwif);
|
||||
stat = hwif->tp_ops->read_status(hwif);
|
||||
local_irq_restore(flags);
|
||||
|
||||
progress_indication = ((stat & SEEK_STAT) == 0) ? 0 : 0x10000;
|
||||
|
Reference in New Issue
Block a user