hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ide: refactor tf_load() method 

Simplify tf_load() method, making it deal only with 'struct ide_taskfile' and
the validity flags that the upper layer passes, and moving the code that deals
with the high order bytes into the only function interested, do_rw_taskfile().

This should stop the needless code duplication in this method and so make
it about twice smaller than it was; along with simplifying the setup for the
method call, this should save both time and space...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Sergei Shtylyov 2009-04-08 14:13:03 +02:00 committed by Bartlomiej Zolnierkiewicz
parent 30881b9ac9
commit c9ff9e7b64
7 changed files with 18 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/ide/ide-io-std.c
View File

@ -85,13 +85,11 @@ void ide_dev_select(ide_drive_t *drive)
} }
EXPORT_SYMBOL_GPL(ide_dev_select); EXPORT_SYMBOL_GPL(ide_dev_select);
void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) void ide_tf_load(ide_drive_t *drive, struct ide_taskfile *tf, u8 valid)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
struct ide_io_ports *io_ports = &hwif->io_ports; struct ide_io_ports *io_ports = &hwif->io_ports;
struct ide_taskfile *tf = &cmd->hob;
void (*tf_outb)(u8 addr, unsigned long port); void (*tf_outb)(u8 addr, unsigned long port);
u8 valid = cmd->valid.out.hob;
u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0;
if (mmio) if (mmio)
@ -99,20 +97,6 @@ void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
else else
tf_outb = ide_outb; tf_outb = ide_outb;
if (valid & IDE_VALID_FEATURE)
tf_outb(tf->feature, io_ports->feature_addr);
if (valid & IDE_VALID_NSECT)
tf_outb(tf->nsect, io_ports->nsect_addr);
if (valid & IDE_VALID_LBAL)
tf_outb(tf->lbal, io_ports->lbal_addr);
if (valid & IDE_VALID_LBAM)
tf_outb(tf->lbam, io_ports->lbam_addr);
if (valid & IDE_VALID_LBAH)
tf_outb(tf->lbah, io_ports->lbah_addr);
tf = &cmd->tf;
valid = cmd->valid.out.tf;
if (valid & IDE_VALID_FEATURE) if (valid & IDE_VALID_FEATURE)
tf_outb(tf->feature, io_ports->feature_addr); tf_outb(tf->feature, io_ports->feature_addr);
if (valid & IDE_VALID_NSECT) if (valid & IDE_VALID_NSECT)

11
drivers/ide/ide-iops.c
View File

@ -312,10 +312,10 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
{ {
ide_hwif_t *hwif = drive->hwif; ide_hwif_t *hwif = drive->hwif;
const struct ide_tp_ops *tp_ops = hwif->tp_ops; const struct ide_tp_ops *tp_ops = hwif->tp_ops;
struct ide_taskfile tf;
u16 *id = drive->id, i; u16 *id = drive->id, i;
int error = 0; int error = 0;
u8 stat; u8 stat;
struct ide_cmd cmd;
#ifdef CONFIG_BLK_DEV_IDEDMA #ifdef CONFIG_BLK_DEV_IDEDMA
if (hwif->dma_ops) /* check if host supports DMA */ if (hwif->dma_ops) /* check if host supports DMA */
@ -347,12 +347,11 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
udelay(1); udelay(1);
tp_ops->write_devctl(hwif, ATA_NIEN | ATA_DEVCTL_OBS); tp_ops->write_devctl(hwif, ATA_NIEN | ATA_DEVCTL_OBS);
memset(&cmd, 0, sizeof(cmd)); memset(&tf, 0, sizeof(tf));
cmd.valid.out.tf = IDE_VALID_FEATURE | IDE_VALID_NSECT; tf.feature = SETFEATURES_XFER;
cmd.tf.feature = SETFEATURES_XFER; tf.nsect = speed;
cmd.tf.nsect = speed;
tp_ops->tf_load(drive, &cmd); tp_ops->tf_load(drive, &tf, IDE_VALID_FEATURE | IDE_VALID_NSECT);
tp_ops->exec_command(hwif, ATA_CMD_SET_FEATURES); tp_ops->exec_command(hwif, ATA_CMD_SET_FEATURES);

8
drivers/ide/ide-probe.c
View File

@ -283,13 +283,11 @@ int ide_dev_read_id(ide_drive_t *drive, u8 cmd, u16 *id)
* identify command to be sure of reply * identify command to be sure of reply
*/ */
if (cmd == ATA_CMD_ID_ATAPI) { if (cmd == ATA_CMD_ID_ATAPI) {
struct ide_cmd cmd; struct ide_taskfile tf;
memset(&cmd, 0, sizeof(cmd)); memset(&tf, 0, sizeof(tf));
/* disable DMA & overlap */ /* disable DMA & overlap */
cmd.valid.out.tf = IDE_VALID_FEATURE; tp_ops->tf_load(drive, &tf, IDE_VALID_FEATURE);
tp_ops->tf_load(drive, &cmd);
} }
/* ask drive for ID */ /* ask drive for ID */

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

@ -98,7 +98,8 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)
cmd->tf.device |= drive->select; cmd->tf.device |= drive->select;
} }
tp_ops->tf_load(drive, cmd); tp_ops->tf_load(drive, &cmd->hob, cmd->valid.out.hob);
tp_ops->tf_load(drive, &cmd->tf, cmd->valid.out.tf);
} }
switch (cmd->protocol) { switch (cmd->protocol) {

18
drivers/ide/scc_pata.c
View File

@ -645,25 +645,9 @@ static int __devinit init_setup_scc(struct pci_dev *dev,
return rc; return rc;
} }
static void scc_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) static void scc_tf_load(ide_drive_t *drive, struct ide_taskfile *tf, u8 valid)
{ {
struct ide_io_ports *io_ports = &drive->hwif->io_ports; struct ide_io_ports *io_ports = &drive->hwif->io_ports;
struct ide_taskfile *tf = &cmd->hob;
u8 valid = cmd->valid.out.hob;
if (valid & IDE_VALID_FEATURE)
scc_ide_outb(tf->feature, io_ports->feature_addr);
if (valid & IDE_VALID_NSECT)
scc_ide_outb(tf->nsect, io_ports->nsect_addr);
if (valid & IDE_VALID_LBAL)
scc_ide_outb(tf->lbal, io_ports->lbal_addr);
if (valid & IDE_VALID_LBAM)
scc_ide_outb(tf->lbam, io_ports->lbam_addr);
if (valid & IDE_VALID_LBAH)
scc_ide_outb(tf->lbah, io_ports->lbah_addr);
tf = &cmd->tf;
valid = cmd->valid.out.tf;
if (valid & IDE_VALID_FEATURE) if (valid & IDE_VALID_FEATURE)
scc_ide_outb(tf->feature, io_ports->feature_addr); scc_ide_outb(tf->feature, io_ports->feature_addr);

7
drivers/ide/tx4939ide.c
View File

@ -434,11 +434,12 @@ static void tx4939ide_tf_load_fixup(ide_drive_t *drive)
tx4939ide_writew(sysctl, base, TX4939IDE_Sys_Ctl); tx4939ide_writew(sysctl, base, TX4939IDE_Sys_Ctl);
} }
static void tx4939ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) static void tx4939ide_tf_load(ide_drive_t *drive, struct ide_taskfile *tf,
u8 valid)
{ {
ide_tf_load(drive, cmd); ide_tf_load(drive, tf, valid);
if (cmd->valid.out.tf & IDE_VALID_DEVICE) if (valid & IDE_VALID_DEVICE)
tx4939ide_tf_load_fixup(drive); tx4939ide_tf_load_fixup(drive);
} }

4
include/linux/ide.h
View File

@ -624,7 +624,7 @@ struct ide_tp_ops {
void (*write_devctl)(struct hwif_s *, u8); void (*write_devctl)(struct hwif_s *, u8);
void (*dev_select)(ide_drive_t *); void (*dev_select)(ide_drive_t *);
void (*tf_load)(ide_drive_t *, struct ide_cmd *); void (*tf_load)(ide_drive_t *, struct ide_taskfile *, u8);
void (*tf_read)(ide_drive_t *, struct ide_cmd *); void (*tf_read)(ide_drive_t *, struct ide_cmd *);
void (*input_data)(ide_drive_t *, struct ide_cmd *, void (*input_data)(ide_drive_t *, struct ide_cmd *,
@ -1132,7 +1132,7 @@ u8 ide_read_altstatus(ide_hwif_t *);
void ide_write_devctl(ide_hwif_t *, u8); void ide_write_devctl(ide_hwif_t *, u8);
void ide_dev_select(ide_drive_t *); void ide_dev_select(ide_drive_t *);
void ide_tf_load(ide_drive_t *, struct ide_cmd *); void ide_tf_load(ide_drive_t *, struct ide_taskfile *, u8);
void ide_tf_read(ide_drive_t *, struct ide_cmd *); void ide_tf_read(ide_drive_t *, struct ide_cmd *);
void ide_input_data(ide_drive_t *, struct ide_cmd *, void *, unsigned int); void ide_input_data(ide_drive_t *, struct ide_cmd *, void *, unsigned int);