Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f52a329 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ce635f60

drivers/ide/ppc/pmac.c

+2 −2
Original line number Diff line number Diff line
@@ -1133,8 +1133,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw) 
		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 *pmif, ide_hwif_t *hwif) 
		return;

	}



	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;