Skip to content

Commit bef8c5f

Browse files
tititiou36broonie
authored andcommitted
spi: qcom: geni: Simplify DMA setting
As stated in [1], dma_set_mask() with a 64-bit mask will never fail if dev->dma_mask is non-NULL. So, if it fails, the 32 bits case will also fail for the same reason. Simplify code and remove some dead code accordingly. [1]: https://lkml.org/lkml/2021/6/7/398 Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Link: https://lore.kernel.org/r/1b14e4ce91a33c16b2c655389c728071a9c9aa2e.1641643601.git.christophe.jaillet@wanadoo.fr Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent fa18343 commit bef8c5f

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

drivers/spi/spi-geni-qcom.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -898,11 +898,8 @@ static int spi_geni_probe(struct platform_device *pdev)
898898
return irq;
899899

900900
ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
901-
if (ret) {
902-
ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
903-
if (ret)
904-
return dev_err_probe(dev, ret, "could not set DMA mask\n");
905-
}
901+
if (ret)
902+
return dev_err_probe(dev, ret, "could not set DMA mask\n");
906903

907904
base = devm_platform_ioremap_resource(pdev, 0);
908905
if (IS_ERR(base))

0 commit comments

Comments
 (0)