Commit 96b34ce7 authored by Phil Sutter's avatar Phil Sutter Committed by Jeff Garzik

pata-rb532-cf: replace rb532_pata_finish_io()

Since the delay used internally is just the same as ata_sff_pause()
uses, rb532_pata_finish_io() does exactly the same as ata_sff_pause()
and thus can be replaced by the later one.
Signed-off-by: default avatarPhil Sutter <n0-1@freewrt.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 84bcbeeb
...@@ -54,22 +54,11 @@ struct rb532_cf_info { ...@@ -54,22 +54,11 @@ struct rb532_cf_info {
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
static inline void rb532_pata_finish_io(struct ata_port *ap)
{
struct ata_host *ah = ap->host;
struct rb532_cf_info *info = ah->private_data;
/* FIXME: Keep previous delay. If this is merely a fence then
ata_sff_sync might be sufficient. */
ata_sff_dma_pause(ap);
ndelay(RB500_CF_IO_DELAY);
}
static void rb532_pata_exec_command(struct ata_port *ap, static void rb532_pata_exec_command(struct ata_port *ap,
const struct ata_taskfile *tf) const struct ata_taskfile *tf)
{ {
writeb(tf->command, ap->ioaddr.command_addr); writeb(tf->command, ap->ioaddr.command_addr);
rb532_pata_finish_io(ap); ata_sff_pause(ap);
} }
static unsigned int rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf, static unsigned int rb532_pata_data_xfer(struct ata_device *adev, unsigned char *buf,
...@@ -87,7 +76,7 @@ static unsigned int rb532_pata_data_xfer(struct ata_device *adev, unsigned char ...@@ -87,7 +76,7 @@ static unsigned int rb532_pata_data_xfer(struct ata_device *adev, unsigned char
*buf = readb(ioaddr); *buf = readb(ioaddr);
} }
rb532_pata_finish_io(adev->link->ap); ata_sff_pause(ap);
return retlen; return retlen;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment