ide-pmac: use custom hwif->sg_max_nents only if DMA support is enabled
Move setting hwif->sg_max_nents from pmac_ide_setup_device() to pmac_ide_setup_dma(). Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
ce635f605e
commit
4f52a32994
1 changed files with 2 additions and 2 deletions
|
@ -1133,8 +1133,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw)
|
||||||
hwif->noprobe = 0;
|
hwif->noprobe = 0;
|
||||||
#endif /* CONFIG_PMAC_MEDIABAY */
|
#endif /* CONFIG_PMAC_MEDIABAY */
|
||||||
|
|
||||||
hwif->sg_max_nents = MAX_DCMDS;
|
|
||||||
|
|
||||||
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
|
#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC
|
||||||
/* has a DBDMA controller channel */
|
/* has a DBDMA controller channel */
|
||||||
if (pmif->dma_regs)
|
if (pmif->dma_regs)
|
||||||
|
@ -1751,6 +1749,8 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
hwif->sg_max_nents = MAX_DCMDS;
|
||||||
|
|
||||||
hwif->dma_host_set = &pmac_ide_dma_host_set;
|
hwif->dma_host_set = &pmac_ide_dma_host_set;
|
||||||
hwif->dma_setup = &pmac_ide_dma_setup;
|
hwif->dma_setup = &pmac_ide_dma_setup;
|
||||||
hwif->dma_exec_cmd = &pmac_ide_dma_exec_cmd;
|
hwif->dma_exec_cmd = &pmac_ide_dma_exec_cmd;
|
||||||
|
|
Loading…
Reference in a new issue