spi: sprd: Simplify with dev_err_probe()
Subsystems (2)
PATCH 1/1 spi: sprd: Simplify with dev_err_probe()
Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
---
Rebased on broonie/spi.git, for-5.10
--- drivers/spi/spi-sprd-adi.c | 5 +---- drivers/spi/spi-sprd.c | 17 +++++------------ 2 files changed, 6 insertions(+), 16 deletions(-)
drivers/spi/spi-sprd-adi.c +1 -4
@@ -504,10 +504,7 @@ static int sprd_adi_probe(struct platform_device *pdev)dev_info (&pdev->dev,"no hardware spinlock supplied\n" );break ;default : -dev_err (&pdev->dev, -"failed to find hwlock id, %d\n" , ret); - fallthrough; -case -EPROBE_DEFER : +dev_err_probe (&pdev->dev, ret,"failed to find hwlock id\n" ); goto put_ctlr; } }
drivers/spi/spi-sprd.c +5 -12
@@ -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) { 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 (PTR_ERR (ss->dma.dma_chan[SPRD_SPI_RX ]) == -EPROBE_DEFER ) -return PTR_ERR (ss->dma.dma_chan[SPRD_SPI_RX ]); - -dev_err (ss->dev,"request RX DMA channel failed!\n" ); -return PTR_ERR (ss->dma.dma_chan[SPRD_SPI_RX ]); - } +if (IS_ERR_OR_NULL (ss->dma.dma_chan[SPRD_SPI_RX ])) +return dev_err_probe (ss->dev,PTR_ERR (ss->dma.dma_chan[SPRD_SPI_RX ]), +"request RX DMA channel failed!\n" ); 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 ])) {dma_release_channel (ss->dma.dma_chan[SPRD_SPI_RX ]); -if (PTR_ERR (ss->dma.dma_chan[SPRD_SPI_TX ]) == -EPROBE_DEFER ) -return PTR_ERR (ss->dma.dma_chan[SPRD_SPI_TX ]); - -dev_err (ss->dev,"request TX DMA channel failed!\n" ); -return PTR_ERR (ss->dma.dma_chan[SPRD_SPI_TX ]); +return dev_err_probe (ss->dev,PTR_ERR (ss->dma.dma_chan[SPRD_SPI_TX ]), +"request TX DMA channel failed!\n" ); }return 0 ;
Signature · 1 line
2.17.1
Mark Brown
maintainerQuoted 2 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/1] spi: sprd: Simplify with dev_err_probe()
commit: 9d99e55833dddf76dd6470e7ce97201abb612c03
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark