Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

libata: rename ATA_PROT_ATAPI_* to ATAPI_PROT_* 



ATA_PROT_ATAPI_* are ugly and naming schemes between ATA_PROT_* and
ATA_PROT_ATAPI_* are inconsistent causing confusion.  Rename them to
ATAPI_PROT_* and make them consistent with ATA counterpart.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 537b53c1

drivers/ata/libata-core.c

+14 −14
Original line number Diff line number Diff line
@@ -4678,8 +4678,8 @@ int ata_check_atapi_dma(struct ata_queued_cmd *qc) 
 */

static int atapi_qc_may_overflow(struct ata_queued_cmd *qc)

{

	if (qc->tf.protocol != ATA_PROT_ATAPI &&

	    qc->tf.protocol != ATA_PROT_ATAPI_DMA)

	if (qc->tf.protocol != ATAPI_PROT_PIO &&

	    qc->tf.protocol != ATAPI_PROT_DMA)

		return 0;



	if (qc->tf.flags & ATA_TFLAG_WRITE)
@@ -5161,13 +5161,13 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc) 
	ata_altstatus(ap); /* flush */



	switch (qc->tf.protocol) {

	case ATA_PROT_ATAPI:

	case ATAPI_PROT_PIO:

		ap->hsm_task_state = HSM_ST;

		break;

	case ATA_PROT_ATAPI_NODATA:

	case ATAPI_PROT_NODATA:

		ap->hsm_task_state = HSM_ST_LAST;

		break;

	case ATA_PROT_ATAPI_DMA:

	case ATAPI_PROT_DMA:

		ap->hsm_task_state = HSM_ST_LAST;

		/* initiate bmdma */

		ap->ops->bmdma_start(qc);
@@ -5518,7 +5518,7 @@ fsm_start: 


	case HSM_ST:

		/* complete command or read/write the data register */

		if (qc->tf.protocol == ATA_PROT_ATAPI) {

		if (qc->tf.protocol == ATAPI_PROT_PIO) {

			/* ATAPI PIO protocol */

			if ((status & ATA_DRQ) == 0) {

				/* No more data to transfer or device error.
@@ -6073,11 +6073,11 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc) 
		switch (qc->tf.protocol) {

		case ATA_PROT_PIO:

		case ATA_PROT_NODATA:

		case ATA_PROT_ATAPI:

		case ATA_PROT_ATAPI_NODATA:

		case ATAPI_PROT_PIO:

		case ATAPI_PROT_NODATA:

			qc->tf.flags |= ATA_TFLAG_POLLING;

			break;

		case ATA_PROT_ATAPI_DMA:

		case ATAPI_PROT_DMA:

			if (qc->dev->flags & ATA_DFLAG_CDB_INTR)

				/* see ata_dma_blacklisted() */

				BUG();
@@ -6141,8 +6141,8 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc) 


		break;



	case ATA_PROT_ATAPI:

	case ATA_PROT_ATAPI_NODATA:

	case ATAPI_PROT_PIO:

	case ATAPI_PROT_NODATA:

		if (qc->tf.flags & ATA_TFLAG_POLLING)

			ata_qc_set_polling(qc);
@@ -6156,7 +6156,7 @@ unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc) 
			ata_port_queue_task(ap, ata_pio_task, qc, 0);

		break;



	case ATA_PROT_ATAPI_DMA:

	case ATAPI_PROT_DMA:

		WARN_ON(qc->tf.flags & ATA_TFLAG_POLLING);



		ap->ops->tf_load(ap, &qc->tf);	 /* load tf registers */
@@ -6217,7 +6217,7 @@ inline unsigned int ata_host_intr(struct ata_port *ap, 
		break;

	case HSM_ST_LAST:

		if (qc->tf.protocol == ATA_PROT_DMA ||

		    qc->tf.protocol == ATA_PROT_ATAPI_DMA) {

		    qc->tf.protocol == ATAPI_PROT_DMA) {

			/* check status of DMA engine */

			host_stat = ap->ops->bmdma_status(ap);

			VPRINTK("ata%u: host_stat 0x%X\n",
@@ -6259,7 +6259,7 @@ inline unsigned int ata_host_intr(struct ata_port *ap, 
	ata_hsm_move(ap, qc, status, 0);



	if (unlikely(qc->err_mask) && (qc->tf.protocol == ATA_PROT_DMA ||

				       qc->tf.protocol == ATA_PROT_ATAPI_DMA))

				       qc->tf.protocol == ATAPI_PROT_DMA))

		ata_ehi_push_desc(ehi, "BMDMA stat 0x%x", host_stat);



	return 1;	/* irq handled */

drivers/ata/libata-eh.c

+4 −4
Original line number Diff line number Diff line
@@ -1299,10 +1299,10 @@ static unsigned int atapi_eh_request_sense(struct ata_queued_cmd *qc) 


	/* is it pointless to prefer PIO for "safety reasons"? */

	if (ap->flags & ATA_FLAG_PIO_DMA) {

		tf.protocol = ATA_PROT_ATAPI_DMA;

		tf.protocol = ATAPI_PROT_DMA;

		tf.feature |= ATAPI_PKT_DMA;

	} else {

		tf.protocol = ATA_PROT_ATAPI;

		tf.protocol = ATAPI_PROT_PIO;

		tf.lbam = SCSI_SENSE_BUFFERSIZE;

		tf.lbah = 0;

	}
@@ -1979,8 +1979,8 @@ static void ata_eh_link_report(struct ata_link *link) 
				[ATA_PROT_PIO]		= "pio",

				[ATA_PROT_DMA]		= "dma",

				[ATA_PROT_NCQ]		= "ncq",

				[ATA_PROT_ATAPI]	= "pio",

				[ATA_PROT_ATAPI_DMA]	= "dma",

				[ATAPI_PROT_PIO]	= "pio",

				[ATAPI_PROT_DMA]	= "dma",

			};



			snprintf(data_buf, sizeof(data_buf), " %s %u %s",

drivers/ata/libata-scsi.c

+5 −5
Original line number Diff line number Diff line
@@ -2354,10 +2354,10 @@ static void atapi_request_sense(struct ata_queued_cmd *qc) 
	qc->tf.command = ATA_CMD_PACKET;



	if (ata_pio_use_silly(ap)) {

		qc->tf.protocol = ATA_PROT_ATAPI_DMA;

		qc->tf.protocol = ATAPI_PROT_DMA;

		qc->tf.feature |= ATAPI_PKT_DMA;

	} else {

		qc->tf.protocol = ATA_PROT_ATAPI;

		qc->tf.protocol = ATAPI_PROT_PIO;

		qc->tf.lbam = SCSI_SENSE_BUFFERSIZE;

		qc->tf.lbah = 0;

	}
@@ -2528,12 +2528,12 @@ static unsigned int atapi_xlat(struct ata_queued_cmd *qc) 
	if (using_pio || nodata) {

		/* no data, or PIO data xfer */

		if (nodata)

			qc->tf.protocol = ATA_PROT_ATAPI_NODATA;

			qc->tf.protocol = ATAPI_PROT_NODATA;

		else

			qc->tf.protocol = ATA_PROT_ATAPI;

			qc->tf.protocol = ATAPI_PROT_PIO;

	} else {

		/* DMA data xfer */

		qc->tf.protocol = ATA_PROT_ATAPI_DMA;

		qc->tf.protocol = ATAPI_PROT_DMA;

		qc->tf.feature |= ATAPI_PKT_DMA;



		if (atapi_dmadir && (scmd->sc_data_direction != DMA_TO_DEVICE))

drivers/ata/libata-sff.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ void ata_bmdma_drive_eh(struct ata_port *ap, ata_prereset_fn_t prereset, 
	ap->hsm_task_state = HSM_ST_IDLE;



	if (qc && (qc->tf.protocol == ATA_PROT_DMA ||

		   qc->tf.protocol == ATA_PROT_ATAPI_DMA)) {

		   qc->tf.protocol == ATAPI_PROT_DMA)) {

		u8 host_stat;



		host_stat = ap->ops->bmdma_status(ap);

drivers/ata/pata_pdc202xx_old.c

+2 −3
Original line number Diff line number Diff line
@@ -168,8 +168,7 @@ static void pdc2026x_bmdma_start(struct ata_queued_cmd *qc) 
	pdc202xx_set_dmamode(ap, qc->dev);



	/* Cases the state machine will not complete correctly without help */

	if ((tf->flags & ATA_TFLAG_LBA48) ||  tf->protocol == ATA_PROT_ATAPI_DMA)

	{

	if ((tf->flags & ATA_TFLAG_LBA48) ||  tf->protocol == ATAPI_PROT_DMA) {

		len = qc->nbytes / 2;



		if (tf->flags & ATA_TFLAG_WRITE)
@@ -208,7 +207,7 @@ static void pdc2026x_bmdma_stop(struct ata_queued_cmd *qc) 
	void __iomem *atapi_reg = master + 0x20 + (4 * ap->port_no);



	/* Cases the state machine will not complete correctly */

	if (tf->protocol == ATA_PROT_ATAPI_DMA || ( tf->flags & ATA_TFLAG_LBA48)) {

	if (tf->protocol == ATAPI_PROT_DMA || (tf->flags & ATA_TFLAG_LBA48)) {

		iowrite32(0, atapi_reg);

		iowrite8(ioread8(clock) & ~sel66, clock);

	}