ide-pmac: use custom hwif->sg_max_nents only if DMA support is enabled
PATCH 6/6 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().
Cc Benjamin Herrenschmidt <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/ide/ppc/pmac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ide/ppc/pmac.c +2 -2
@@ -1133,8 +1133,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *p hwif->noprobe =0 ;#endif /* CONFIG_PMAC_MEDIABAY */ - hwif->sg_max_nents =MAX_DCMDS ; -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC /* has a DBDMA controller channel */ if (pmif->dma_regs)
@@ -1751,6 +1749,8 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmifreturn ; } + hwif->sg_max_nents =MAX_DCMDS ; + hwif->dma_host_set = &pmac_ide_dma_host_set; hwif->dma_setup = &pmac_ide_dma_setup; hwif->dma_exec_cmd = &pmac_ide_dma_exec_cmd;
Quoted 5 lines · Bartlomiej Zolnierkiewicz
Move setting
hwif->sg_max_nentsfrompmac_ide_setup_device()topmac_ide_setup_dma().Cc Benjamin Herrenschmidt <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Ack.
Quoted 26 lines
--- drivers/ide/ppc/pmac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)Index:
b/drivers/ide/ppc/pmac.c
===================================================================drivers/ide/ppc/pmac.c +2
-2@@ -1133,8 +1133,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *p hwif->noprobe =0 ;#endif /* CONFIG_PMAC_MEDIABAY */ - hwif->sg_max_nents =MAX_DCMDS ; -#ifdef CONFIG_BLK_DEV_IDEDMA_PMAC /* has a DBDMA controller channel */ if (pmif->dma_regs)@@ -1751,6 +1749,8 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmifreturn ; } + hwif->sg_max_nents =MAX_DCMDS ; + hwif->dma_host_set = &pmac_ide_dma_host_set; hwif->dma_setup = &pmac_ide_dma_setup; hwif->dma_exec_cmd = &pmac_ide_dma_exec_cmd;
Quoted 5 lines · Bartlomiej Zolnierkiewicz
Move setting
hwif->sg_max_nentsfrompmac_ide_setup_device()topmac_ide_setup_dma().Cc Benjamin Herrenschmidt <[email protected]>Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
Acked-by Sergei Shtylyov <[email protected]>
MBR, Sergei