git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
ata
/
sata_qstor.c
diff --git
a/drivers/ata/sata_qstor.c
b/drivers/ata/sata_qstor.c
index
2f1de6e
..
91cc12c
100644
(file)
--- a/
drivers/ata/sata_qstor.c
+++ b/
drivers/ata/sata_qstor.c
@@
-270,7
+270,7
@@
static int qs_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val)
static void qs_error_handler(struct ata_port *ap)
{
qs_enter_reg_mode(ap);
static void qs_error_handler(struct ata_port *ap)
{
qs_enter_reg_mode(ap);
- ata_do_eh(ap, qs_prereset,
ata_std_softreset, NULL
,
+ ata_do_eh(ap, qs_prereset,
NULL, sata_std_hardreset
,
ata_std_postreset);
}
ata_std_postreset);
}
@@
-287,14
+287,10
@@
static unsigned int qs_fill_sg(struct ata_queued_cmd *qc)
struct scatterlist *sg;
struct ata_port *ap = qc->ap;
struct qs_port_priv *pp = ap->private_data;
struct scatterlist *sg;
struct ata_port *ap = qc->ap;
struct qs_port_priv *pp = ap->private_data;
- unsigned int nelem;
u8 *prd = pp->pkt + QS_CPB_BYTES;
u8 *prd = pp->pkt + QS_CPB_BYTES;
+ unsigned int si;
- WARN_ON(qc->__sg == NULL);
- WARN_ON(qc->n_elem == 0 && qc->pad_len == 0);
-
- nelem = 0;
- ata_for_each_sg(sg, qc) {
+ for_each_sg(qc->sg, sg, qc->n_elem, si) {
u64 addr;
u32 len;
u64 addr;
u32 len;
@@
-306,12
+302,11
@@
static unsigned int qs_fill_sg(struct ata_queued_cmd *qc)
*(__le32 *)prd = cpu_to_le32(len);
prd += sizeof(u64);
*(__le32 *)prd = cpu_to_le32(len);
prd += sizeof(u64);
- VPRINTK("PRD[%u] = (0x%llX, 0x%X)\n",
nelem
,
+ VPRINTK("PRD[%u] = (0x%llX, 0x%X)\n",
si
,
(unsigned long long)addr, len);
(unsigned long long)addr, len);
- nelem++;
}
}
- return
nelem
;
+ return
si
;
}
static void qs_qc_prep(struct ata_queued_cmd *qc)
}
static void qs_qc_prep(struct ata_queued_cmd *qc)
@@
-376,7
+371,7
@@
static unsigned int qs_qc_issue(struct ata_queued_cmd *qc)
qs_packet_start(qc);
return 0;
qs_packet_start(qc);
return 0;
- case ATA
_PROT_ATAPI
_DMA:
+ case ATA
PI_PROT
_DMA:
BUG();
break;
BUG();
break;