ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

spi: sprd: Simplify with dev_err_probe()

Browse Source 
Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and the error value gets printed.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Chunyan Zhang <zhang.lyra@gmail.com>
Link: https://lore.kernel.org/r/20200910160706.5883-1-krzk@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Krzysztof Kozlowski
2020-09-10 18:07:06 +02:00
committed by Mark Brown
parent 6d66507d9b
commit 9d99e55833
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/spi/spi-sprd-adi.c
View File

@@ -504,10 +504,7 @@ static int sprd_adi_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "no hardware spinlock supplied\n"); dev_info(&pdev->dev, "no hardware spinlock supplied\n");
break; break;
default: default:
dev_err(&pdev->dev, dev_err_probe(&pdev->dev, ret, "failed to find hwlock id\n");
"failed to find hwlock id, %d\n", ret);
fallthrough;
case -EPROBE_DEFER:
goto put_ctlr; goto put_ctlr;
} }
} }

17
drivers/spi/spi-sprd.c
View File

@@ -553,22 +553,15 @@ static int sprd_spi_dma_tx_config(struct sprd_spi *ss, struct spi_transfer *t)
static int sprd_spi_dma_request(struct sprd_spi *ss) static int sprd_spi_dma_request(struct sprd_spi *ss)
{ {
ss->dma.dma_chan[SPRD_SPI_RX] = dma_request_chan(ss->dev, "rx_chn"); ss->dma.dma_chan[SPRD_SPI_RX] = dma_request_chan(ss->dev, "rx_chn");
if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_RX])) { if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_RX]))
if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]) == -EPROBE_DEFER) return dev_err_probe(ss->dev, PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]),
return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]); "request RX DMA channel failed!\n");
dev_err(ss->dev, "request RX DMA channel failed!\n");
return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]);
}
ss->dma.dma_chan[SPRD_SPI_TX] = dma_request_chan(ss->dev, "tx_chn"); ss->dma.dma_chan[SPRD_SPI_TX] = dma_request_chan(ss->dev, "tx_chn");
if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_TX])) { if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_TX])) {
dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]); dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]);
if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]) == -EPROBE_DEFER) return dev_err_probe(ss->dev, PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]),
return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]); "request TX DMA channel failed!\n");
dev_err(ss->dev, "request TX DMA channel failed!\n");
return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]);
} }
return 0; return 0;