Skip to content

Commit

Permalink
pata-rb532-cf: replace rb532_pata_finish_io()
Browse files Browse the repository at this point in the history
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: Phil Sutter <n0-1@freewrt.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Phil Sutter authored and Jeff Garzik committed Mar 25, 2009
1 parent 84bcbee commit 96b34ce
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions drivers/ata/pata_rb532_cf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
const struct ata_taskfile *tf)
{
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,
Expand All @@ -87,7 +76,7 @@ static unsigned int rb532_pata_data_xfer(struct ata_device *adev, unsigned char
*buf = readb(ioaddr);
}

rb532_pata_finish_io(adev->link->ap);
ata_sff_pause(ap);
return retlen;
}

Expand Down

0 comments on commit 96b34ce

Please sign in to comment.