projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] PCI: Improve PCI config space writeback
[powerpc.git]
/
drivers
/
scsi
/
pdc_adma.c
diff --git
a/drivers/scsi/pdc_adma.c
b/drivers/scsi/pdc_adma.c
index
5f33cc9
..
5cda16c
100644
(file)
--- a/
drivers/scsi/pdc_adma.c
+++ b/
drivers/scsi/pdc_adma.c
@@
-143,8
+143,6
@@
static struct scsi_host_template adma_ata_sht = {
.name = DRV_NAME,
.ioctl = ata_scsi_ioctl,
.queuecommand = ata_scsi_queuecmd,
.name = DRV_NAME,
.ioctl = ata_scsi_ioctl,
.queuecommand = ata_scsi_queuecmd,
- .eh_timed_out = ata_scsi_timed_out,
- .eh_strategy_handler = ata_scsi_error,
.can_queue = ATA_DEF_QUEUE,
.this_id = ATA_SHT_THIS_ID,
.sg_tablesize = LIBATA_MAX_PRD,
.can_queue = ATA_DEF_QUEUE,
.this_id = ATA_SHT_THIS_ID,
.sg_tablesize = LIBATA_MAX_PRD,
@@
-322,7
+320,7
@@
static int adma_fill_sg(struct ata_queued_cmd *qc)
= (pFLAGS & pEND) ? 0 : cpu_to_le32(pp->pkt_dma + i + 4);
i += 4;
= (pFLAGS & pEND) ? 0 : cpu_to_le32(pp->pkt_dma + i + 4);
i += 4;
- VPRINTK("PRD[%u] = (0x%lX, 0x%X)\n",
nelem
,
+ VPRINTK("PRD[%u] = (0x%lX, 0x%X)\n",
i/4
,
(unsigned long)addr, len);
}
return i;
(unsigned long)addr, len);
}
return i;