Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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.

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>

authored by

Krzysztof Kozlowski and committed by
Mark Brown
9d99e558 6d66507d

+6 -16
+1 -4
drivers/spi/spi-sprd-adi.c
··· 504 504 dev_info(&pdev->dev, "no hardware spinlock supplied\n"); 505 505 break; 506 506 default: 507 - dev_err(&pdev->dev, 508 - "failed to find hwlock id, %d\n", ret); 509 - fallthrough; 510 - case -EPROBE_DEFER: 507 + dev_err_probe(&pdev->dev, ret, "failed to find hwlock id\n"); 511 508 goto put_ctlr; 512 509 } 513 510 }
+5 -12
drivers/spi/spi-sprd.c
··· 553 553 static int sprd_spi_dma_request(struct sprd_spi *ss) 554 554 { 555 555 ss->dma.dma_chan[SPRD_SPI_RX] = dma_request_chan(ss->dev, "rx_chn"); 556 - if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_RX])) { 557 - if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]) == -EPROBE_DEFER) 558 - return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]); 559 - 560 - dev_err(ss->dev, "request RX DMA channel failed!\n"); 561 - return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]); 562 - } 556 + if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_RX])) 557 + return dev_err_probe(ss->dev, PTR_ERR(ss->dma.dma_chan[SPRD_SPI_RX]), 558 + "request RX DMA channel failed!\n"); 563 559 564 560 ss->dma.dma_chan[SPRD_SPI_TX] = dma_request_chan(ss->dev, "tx_chn"); 565 561 if (IS_ERR_OR_NULL(ss->dma.dma_chan[SPRD_SPI_TX])) { 566 562 dma_release_channel(ss->dma.dma_chan[SPRD_SPI_RX]); 567 - if (PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]) == -EPROBE_DEFER) 568 - return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]); 569 - 570 - dev_err(ss->dev, "request TX DMA channel failed!\n"); 571 - return PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]); 563 + return dev_err_probe(ss->dev, PTR_ERR(ss->dma.dma_chan[SPRD_SPI_TX]), 564 + "request TX DMA channel failed!\n"); 572 565 } 573 566 574 567 return 0;