lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sata_promise: other cleanups

Browse Source 
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: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Mikael Pettersson
2008-05-17 18:49:09 +02:00
committed by Jeff Garzik
parent 821d22cdcd
commit 7715a6f9cd
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/ata/sata_promise.c
View File

@@ -562,31 +562,25 @@ static void pdc_qc_prep(struct ata_queued_cmd *qc)
switch (qc->tf.protocol) { switch (qc->tf.protocol) {
case ATA_PROT_DMA: case ATA_PROT_DMA:
pdc_fill_sg(qc); pdc_fill_sg(qc);
/* fall through */ /*FALLTHROUGH*/
case ATA_PROT_NODATA: case ATA_PROT_NODATA:
i = pdc_pkt_header(&qc->tf, qc->ap->prd_dma, i = pdc_pkt_header(&qc->tf, qc->ap->prd_dma,
qc->dev->devno, pp->pkt); qc->dev->devno, pp->pkt);
if (qc->tf.flags & ATA_TFLAG_LBA48) if (qc->tf.flags & ATA_TFLAG_LBA48)
i = pdc_prep_lba48(&qc->tf, pp->pkt, i); i = pdc_prep_lba48(&qc->tf, pp->pkt, i);
else else
i = pdc_prep_lba28(&qc->tf, pp->pkt, i); i = pdc_prep_lba28(&qc->tf, pp->pkt, i);
pdc_pkt_footer(&qc->tf, pp->pkt, i); pdc_pkt_footer(&qc->tf, pp->pkt, i);
break; break;
case ATAPI_PROT_PIO: case ATAPI_PROT_PIO:
pdc_fill_sg(qc); pdc_fill_sg(qc);
break; break;
case ATAPI_PROT_DMA: case ATAPI_PROT_DMA:
pdc_fill_sg(qc); pdc_fill_sg(qc);
/*FALLTHROUGH*/ /*FALLTHROUGH*/
case ATAPI_PROT_NODATA: case ATAPI_PROT_NODATA:
pdc_atapi_pkt(qc); pdc_atapi_pkt(qc);
break; break;
default: default:
break; break;
} }
@@ -748,7 +742,7 @@ static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc,
ata_port_abort(ap); 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) struct ata_queued_cmd *qc)
{ {
unsigned int handled = 0; unsigned int handled = 0;
@@ -775,7 +769,6 @@ static inline unsigned int pdc_host_intr(struct ata_port *ap,
ata_qc_complete(qc); ata_qc_complete(qc);
handled = 1; handled = 1;
break; break;
default: default:
ap->stats.idle_irq++; ap->stats.idle_irq++;
break; break;
@@ -832,7 +825,7 @@ static irqreturn_t pdc_interrupt(int irq, void *dev_instance)
goto done_irq; goto done_irq;
} }
mask &= 0xffff; /* only 16 tags possible */ mask &= 0xffff; /* only 16 SEQIDs possible */
if (mask == 0 && hotplug_status == 0) { if (mask == 0 && hotplug_status == 0) {
VPRINTK("QUICK EXIT 3\n"); VPRINTK("QUICK EXIT 3\n");
goto done_irq; goto done_irq;
@@ -879,7 +872,7 @@ done_irq:
return IRQ_RETVAL(handled); 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 ata_port *ap = qc->ap;
struct pdc_port_priv *pp = ap->private_data; 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: case ATA_PROT_DMA:
pdc_packet_start(qc); pdc_packet_start(qc);
return 0; return 0;
default: default:
break; break;
} }
return ata_sff_qc_issue(qc); return ata_sff_qc_issue(qc);
} }