knfsd: remove unreported filehandle stats counters

[safe/jmp/linux-2.6] / drivers / ide / scc_pata.c

diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index feabf54..5be41f2 100644 (file)
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -645,25 +645,9 @@ static int __devinit init_setup_scc(struct pci_dev *dev,
        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_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)
                scc_ide_outb(tf->feature, io_ports->feature_addr);
@@ -679,14 +663,9 @@ static void scc_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)
                scc_ide_outb(tf->device, io_ports->device_addr);
 }
 
-static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
+static void scc_tf_read(ide_drive_t *drive, struct ide_taskfile *tf, u8 valid)
 {
        struct ide_io_ports *io_ports = &drive->hwif->io_ports;
-       struct ide_taskfile *tf = &cmd->tf;
-       u8 valid = cmd->valid.in.tf;
-
-       /* be sure we're looking at the low order bits */
-       scc_write_devctl(hwif, ATA_DEVCTL_OBS);
 
        if (valid & IDE_VALID_ERROR)
                tf->error  = scc_ide_inb(io_ports->feature_addr);
@@ -700,24 +679,6 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
                tf->lbah   = scc_ide_inb(io_ports->lbah_addr);
        if (valid & IDE_VALID_DEVICE)
                tf->device = scc_ide_inb(io_ports->device_addr);
-
-       if (cmd->tf_flags & IDE_TFLAG_LBA48) {
-               scc_write_devctl(hwif, ATA_HOB | ATA_DEVCTL_OBS);
-
-               tf = &cmd->hob;
-               valid = cmd->valid.in.hob;
-
-               if (valid & IDE_VALID_ERROR)
-                       tf->error = scc_ide_inb(io_ports->feature_addr);
-               if (valid & IDE_VALID_NSECT)
-                       tf->nsect = scc_ide_inb(io_ports->nsect_addr);
-               if (valid & IDE_VALID_LBAL)
-                       tf->lbal  = scc_ide_inb(io_ports->lbal_addr);
-               if (valid & IDE_VALID_LBAM)
-                       tf->lbam  = scc_ide_inb(io_ports->lbam_addr);
-               if (valid & IDE_VALID_LBAH)
-                       tf->lbah  = scc_ide_inb(io_ports->lbah_addr);
-       }
 }
 
 static void scc_input_data(ide_drive_t *drive, struct ide_cmd *cmd,