Commit f885521f authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

pata_pcmcia: convert to new data_xfer prototype 



While merging data_xfer prototype change, pata_pcmcia was left out.
Convert it.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 4ca4e439

drivers/ata/pata_pcmcia.c

+11 −8
Original line number Original line Diff line number Diff line
@@ -102,10 +102,10 @@ static int pcmcia_set_mode_8bit(struct ata_link *link, 




/**

/**

 *	ata_data_xfer_8bit	 -	Transfer data by 8bit PIO

 *	ata_data_xfer_8bit	 -	Transfer data by 8bit PIO

 *	@adev: device to target

 *	@dev: device to target

 *	@buf: data buffer

 *	@buf: data buffer

 *	@buflen: buffer length

 *	@buflen: buffer length

 *	@write_data: read/write

 *	@rw: read/write

 *

 *

 *	Transfer data from/to the device data register by 8 bit PIO.

 *	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.

 *	Inherited from caller.

 */

 */





static void ata_data_xfer_8bit(struct ata_device *adev, unsigned char *buf,

static unsigned int ata_data_xfer_8bit(struct ata_device *dev,

		   unsigned int buflen, int write_data)

				unsigned char *buf, unsigned int buflen, int rw)

{

{

	struct ata_port *ap = adev->link->ap;

	struct ata_port *ap = dev->link->ap;

	if (write_data)



		iowrite8_rep(ap->ioaddr.data_addr, buf, buflen);

	if (rw == READ)

	else

		ioread8_rep(ap->ioaddr.data_addr, buf, buflen);

		ioread8_rep(ap->ioaddr.data_addr, buf, buflen);

	else

		iowrite8_rep(ap->ioaddr.data_addr, buf, buflen);



	return buflen;

}

}