spi: spi-geni-qcom: correctly handle -EPROBE_DEFER from dma_request_chan()

superna9999 · broonie · commit 9d7054fb3ac2 · 2023-06-15T14:58:45.000+01:00
Now spi_geni_grab_gpi_chan() errors are correctly reported, the -EPROBE_DEFER error should be returned from probe in case the GPI dma driver is built as module and/or not probed yet. Fixes: b59c122 ("spi: spi-geni-qcom: Add support for GPI dma") Fixes: 6532582 ("spi: spi-geni-qcom: fix error handling in spi_geni_grab_gpi_chan()") Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/r/20230615-topic-sm8550-upstream-fix-spi-geni-qcom-probe-v2-1-670c3d9e8c9c@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c
@@ -646,6 +646,8 @@ static int spi_geni_init(struct spi_geni_master *mas)
 			geni_se_select_mode(se, GENI_GPI_DMA);
 			dev_dbg(mas->dev, "Using GPI DMA mode for SPI\n");
 			break;
+		} else if (ret == -EPROBE_DEFER) {
+			goto out_pm;
 		}
 		/*
 		 * in case of failure to get gpi dma channel, we can still do the

Original file line number	Diff line number	Diff line change
`@@ -646,6 +646,8 @@ static int spi_geni_init(struct spi_geni_master *mas)`
`646`	`646`	`geni_se_select_mode(se, GENI_GPI_DMA);`
`647`	`647`	`dev_dbg(mas->dev, "Using GPI DMA mode for SPI\n");`
`648`	`648`	`break;`
	`649`	`+ } else if (ret == -EPROBE_DEFER) {`
	`650`	`+ goto out_pm;`
`649`	`651`	`}`
`650`	`652`	`/*`
`651`	`653`	`* in case of failure to get gpi dma channel, we can still do the`