| Message ID | 20200901152713.18629-2-krzk@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/11] spi: sprd: Release DMA channel also on probe deferral | expand |
On Tue, 1 Sep 2020 at 23:27, Krzysztof Kozlowski <krzk@kernel.org> wrote: > > 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> Thanks, Chunyan > --- > drivers/spi/spi-sprd-adi.c | 5 +---- > drivers/spi/spi-sprd.c | 17 +++++------------ > 2 files changed, 6 insertions(+), 16 deletions(-) > > diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c > index 127b8bd25831..392ec5cfa3d6 100644 > --- a/drivers/spi/spi-sprd-adi.c > +++ b/drivers/spi/spi-sprd-adi.c > @@ -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; > } > } > diff --git a/drivers/spi/spi-sprd.c b/drivers/spi/spi-sprd.c > index 0443fec3a6ab..635738f54c73 100644 > --- a/drivers/spi/spi-sprd.c > +++ b/drivers/spi/spi-sprd.c > @@ -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; > -- > 2.17.1 >
On Tue, Sep 01, 2020 at 05:27:04PM +0200, Krzysztof Kozlowski wrote: > Common pattern of handling deferred probe can be simplified with > dev_err_probe(). Less code and the error value gets printed. This doesn't apply against current code, please check and resend. Applying: spi: sprd: Simplify with dev_err_probe() Using index info to reconstruct a base tree... M drivers/spi/spi-sprd-adi.c Falling back to patching base and 3-way merge... Auto-merging drivers/spi/spi-sprd-adi.c CONFLICT (content): Merge conflict in drivers/spi/spi-sprd-adi.c
diff --git a/drivers/spi/spi-sprd-adi.c b/drivers/spi/spi-sprd-adi.c index 127b8bd25831..392ec5cfa3d6 100644 --- a/drivers/spi/spi-sprd-adi.c +++ b/drivers/spi/spi-sprd-adi.c @@ -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; } } diff --git a/drivers/spi/spi-sprd.c b/drivers/spi/spi-sprd.c index 0443fec3a6ab..635738f54c73 100644 --- a/drivers/spi/spi-sprd.c +++ b/drivers/spi/spi-sprd.c @@ -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;
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> --- drivers/spi/spi-sprd-adi.c | 5 +---- drivers/spi/spi-sprd.c | 17 +++++------------ 2 files changed, 6 insertions(+), 16 deletions(-)