diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 21:25:10 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 21:25:10 -0400 |
| commit | 0169e284f6b6b263cc7c2ed25986b96cd6fda610 (patch) | |
| tree | 266623b0131e310de6e77a2c87c42b4092902fa4 /drivers/scsi/sata_mv.c | |
| parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) | |
| download | op-kernel-dev-0169e284f6b6b263cc7c2ed25986b96cd6fda610.zip op-kernel-dev-0169e284f6b6b263cc7c2ed25986b96cd6fda610.tar.gz | |
[libata] remove ata_chk_err(), ->check_err() hook.
We now depend on ->tf_read() to provide us with the contents
of the Error shadow register.
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index 422e0b6..dcef5fe 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c @@ -258,7 +258,6 @@ struct mv_host_priv { static void mv_irq_clear(struct ata_port *ap); static u32 mv_scr_read(struct ata_port *ap, unsigned int sc_reg_in); static void mv_scr_write(struct ata_port *ap, unsigned int sc_reg_in, u32 val); -static u8 mv_check_err(struct ata_port *ap); static void mv_phy_reset(struct ata_port *ap); static void mv_host_stop(struct ata_host_set *host_set); static int mv_port_start(struct ata_port *ap); @@ -296,7 +295,6 @@ static const struct ata_port_operations mv_ops = { .tf_load = ata_tf_load, .tf_read = ata_tf_read, .check_status = ata_check_status, - .check_err = mv_check_err, .exec_command = ata_exec_command, .dev_select = ata_std_dev_select, @@ -1185,22 +1183,6 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance, } /** - * mv_check_err - Return the error shadow register to caller. - * @ap: ATA channel to manipulate - * - * Marvell requires DMA to be stopped before accessing shadow - * registers. So we do that, then return the needed register. - * - * LOCKING: - * Inherited from caller. FIXME: protect mv_stop_dma with lock? - */ -static u8 mv_check_err(struct ata_port *ap) -{ - mv_stop_dma(ap); /* can't read shadow regs if DMA on */ - return readb((void __iomem *) ap->ioaddr.error_addr); -} - -/** * mv_phy_reset - Perform eDMA reset followed by COMRESET * @ap: ATA channel to manipulate * |
