mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'next-remove-ldst' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc into next
This commit is contained in:
commit
b7f859dda9
19 changed files with 139 additions and 190 deletions
|
|
@ -540,9 +540,9 @@ static void pata_macio_qc_prep(struct ata_queued_cmd *qc)
|
|||
BUG_ON (pi++ >= MAX_DCMDS);
|
||||
|
||||
len = (sg_len < MAX_DBDMA_SEG) ? sg_len : MAX_DBDMA_SEG;
|
||||
st_le16(&table->command, write ? OUTPUT_MORE: INPUT_MORE);
|
||||
st_le16(&table->req_count, len);
|
||||
st_le32(&table->phy_addr, addr);
|
||||
table->command = cpu_to_le16(write ? OUTPUT_MORE: INPUT_MORE);
|
||||
table->req_count = cpu_to_le16(len);
|
||||
table->phy_addr = cpu_to_le32(addr);
|
||||
table->cmd_dep = 0;
|
||||
table->xfer_status = 0;
|
||||
table->res_count = 0;
|
||||
|
|
@ -557,12 +557,12 @@ static void pata_macio_qc_prep(struct ata_queued_cmd *qc)
|
|||
|
||||
/* Convert the last command to an input/output */
|
||||
table--;
|
||||
st_le16(&table->command, write ? OUTPUT_LAST: INPUT_LAST);
|
||||
table->command = cpu_to_le16(write ? OUTPUT_LAST: INPUT_LAST);
|
||||
table++;
|
||||
|
||||
/* Add the stop command to the end of the list */
|
||||
memset(table, 0, sizeof(struct dbdma_cmd));
|
||||
st_le16(&table->command, DBDMA_STOP);
|
||||
table->command = cpu_to_le16(DBDMA_STOP);
|
||||
|
||||
dev_dbgdma(priv->dev, "%s: %d DMA list entries\n", __func__, pi);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue