renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-15 16:53:54 +08:00
Code

[ARM] dma: pata_icside's contiguous sg array is now redundant

Browse Source 
Now that the IOMD DMA code walks the scatterlist using sg_next,
converting the sg list into a contiguous list is no longer required.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2008-12-08 19:25:28 +00:00 committed by Russell King
parent 9e28d7e8c5
commit f671865336
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/ata/pata_icside.c
View File

@ -57,7 +57,6 @@ struct pata_icside_state {
u8 disabled; u8 disabled;
unsigned int speed[ATA_MAX_DEVICES]; unsigned int speed[ATA_MAX_DEVICES];
} port[2]; } port[2];
struct scatterlist sg[PATA_ICSIDE_MAX_SG];
}; };
struct pata_icside_info { struct pata_icside_info {
@ -222,9 +221,7 @@ static void pata_icside_bmdma_setup(struct ata_queued_cmd *qc)
{ {
struct ata_port *ap = qc->ap; struct ata_port *ap = qc->ap;
struct pata_icside_state *state = ap->host->private_data; struct pata_icside_state *state = ap->host->private_data;
struct scatterlist *sg, *rsg = state->sg;
unsigned int write = qc->tf.flags & ATA_TFLAG_WRITE; unsigned int write = qc->tf.flags & ATA_TFLAG_WRITE;
unsigned int si;
/* /*
* We are simplex; BUG if we try to fiddle with DMA * We are simplex; BUG if we try to fiddle with DMA
@ -232,21 +229,13 @@ static void pata_icside_bmdma_setup(struct ata_queued_cmd *qc)
*/ */
BUG_ON(dma_channel_active(state->dma)); BUG_ON(dma_channel_active(state->dma));
/*
* Copy ATAs scattered sg list into a contiguous array of sg
*/
for_each_sg(qc->sg, sg, qc->n_elem, si) {
memcpy(rsg, sg, sizeof(*sg));
rsg++;
}
/* /*
* Route the DMA signals to the correct interface * Route the DMA signals to the correct interface
*/ */
writeb(state->port[ap->port_no].port_sel, state->ioc_base); writeb(state->port[ap->port_no].port_sel, state->ioc_base);
set_dma_speed(state->dma, state->port[ap->port_no].speed[qc->dev->devno]); set_dma_speed(state->dma, state->port[ap->port_no].speed[qc->dev->devno]);
set_dma_sg(state->dma, state->sg, rsg - state->sg); set_dma_sg(state->dma, qc->sg, qc->n_elem);
set_dma_mode(state->dma, write ? DMA_MODE_WRITE : DMA_MODE_READ); set_dma_mode(state->dma, write ? DMA_MODE_WRITE : DMA_MODE_READ);
/* issue r/w command */ /* issue r/w command */