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

Commit 7715a6f9 authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Jeff Garzik
Browse files

sata_promise: other cleanups 



Minor coding-style fixes for sata_promise:
- remove stray blank lines
- fix checkpatch.pl errors; warnings about long lines
  remain, but I don't intend to address those at this time
- remove two inline directives: neither is essential and
  both functions are trivially inlinable anyway by virtue
  of being static and having a single unique call site
- fix comment in pdc_interrupt(): the bits in PDC_INT_SEQMASK
  denote SEQIDs not tags, the distinction becomes important
  when NCQ gets implemented

Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 821d22cd

drivers/ata/sata_promise.c

+7 −16
Original line number Diff line number Diff line
@@ -562,31 +562,25 @@ static void pdc_qc_prep(struct ata_queued_cmd *qc) 
	switch (qc->tf.protocol) {

	case ATA_PROT_DMA:

		pdc_fill_sg(qc);

		/* fall through */



		/*FALLTHROUGH*/

	case ATA_PROT_NODATA:

		i = pdc_pkt_header(&qc->tf, qc->ap->prd_dma,

				   qc->dev->devno, pp->pkt);



		if (qc->tf.flags & ATA_TFLAG_LBA48)

			i = pdc_prep_lba48(&qc->tf, pp->pkt, i);

		else

			i = pdc_prep_lba28(&qc->tf, pp->pkt, i);



		pdc_pkt_footer(&qc->tf, pp->pkt, i);

		break;



	case ATAPI_PROT_PIO:

		pdc_fill_sg(qc);

		break;



	case ATAPI_PROT_DMA:

		pdc_fill_sg(qc);

		/*FALLTHROUGH*/

	case ATAPI_PROT_NODATA:

		pdc_atapi_pkt(qc);

		break;



	default:

		break;

	}
@@ -748,7 +742,7 @@ static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc, 
	ata_port_abort(ap);

}



static inline unsigned int pdc_host_intr(struct ata_port *ap,

static unsigned int pdc_host_intr(struct ata_port *ap,

				  struct ata_queued_cmd *qc)

{

	unsigned int handled = 0;
@@ -775,7 +769,6 @@ static inline unsigned int pdc_host_intr(struct ata_port *ap, 
		ata_qc_complete(qc);

		handled = 1;

		break;



	default:

		ap->stats.idle_irq++;

		break;
@@ -832,7 +825,7 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance) 
		goto done_irq;

	}



	mask &= 0xffff;		/* only 16 tags possible */

	mask &= 0xffff;		/* only 16 SEQIDs possible */

	if (mask == 0 && hotplug_status == 0) {

		VPRINTK("QUICK EXIT 3\n");

		goto done_irq;
@@ -879,7 +872,7 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance) 
	return IRQ_RETVAL(handled);

}



static inline void pdc_packet_start(struct ata_queued_cmd *qc)

static void pdc_packet_start(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	struct pdc_port_priv *pp = ap->private_data;
@@ -914,11 +907,9 @@ static unsigned int pdc_qc_issue(struct ata_queued_cmd *qc) 
	case ATA_PROT_DMA:

		pdc_packet_start(qc);

		return 0;



	default:

		break;

	}



	return ata_sff_qc_issue(qc);

}