diff options
| author | Tejun Heo <htejun@gmail.com> | 2008-01-02 20:12:47 +0900 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-01-23 05:24:15 -0500 |
| commit | f885521f0aa4a4f9d339cf32a4821a56f3f97426 (patch) | |
| tree | 0f1531e0c1f71eb7f19f15ec174704fec11694de /drivers/ata | |
| parent | 4ca4e439640cd1d3659cbcf60e7a73c2ae0450b3 (diff) | |
pata_pcmcia: convert to new data_xfer prototype
While merging data_xfer prototype change, pata_pcmcia was left out.
Convert it.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_pcmcia.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index ceba93b7754e..3e7f6a9da28b 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c @@ -102,10 +102,10 @@ static int pcmcia_set_mode_8bit(struct ata_link *link, /** * ata_data_xfer_8bit - Transfer data by 8bit PIO - * @adev: device to target + * @dev: device to target * @buf: data buffer * @buflen: buffer length - * @write_data: read/write + * @rw: read/write * * Transfer data from/to the device data register by 8 bit PIO. * @@ -113,14 +113,17 @@ static int pcmcia_set_mode_8bit(struct ata_link *link, * Inherited from caller. */ -static void ata_data_xfer_8bit(struct ata_device *adev, unsigned char *buf, - unsigned int buflen, int write_data) +static unsigned int ata_data_xfer_8bit(struct ata_device *dev, + unsigned char *buf, unsigned int buflen, int rw) { - struct ata_port *ap = adev->link->ap; - if (write_data) - iowrite8_rep(ap->ioaddr.data_addr, buf, buflen); - else + struct ata_port *ap = dev->link->ap; + + if (rw == READ) ioread8_rep(ap->ioaddr.data_addr, buf, buflen); + else + iowrite8_rep(ap->ioaddr.data_addr, buf, buflen); + + return buflen; } |