| Message ID | 20230725035038.1702-1-duminjie@vivo.com |
|---|---|
| State | Accepted |
| Commit | 908e5a3d4e6f60fa2d3912be7087e745639c4404 |
| Headers | show |
| Series | [v2] spi: fsl-dspi: Use dev_err_probe() in dspi_request_dma() | expand |
On Tue, 25 Jul 2023 11:50:37 +0800, Minjie Du wrote: > It is possible for dma_request_chan() to return EPROBE_DEFER, which means > dev is not ready yet. > At this point dev_err() will have no output. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: fsl-dspi: Use dev_err_probe() in dspi_request_dma() commit: 908e5a3d4e6f60fa2d3912be7087e745639c4404 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
On Tue, Jul 25, 2023 at 11:50:37AM +0800, Minjie Du wrote: > It is possible for dma_request_chan() to return EPROBE_DEFER, which means > dev is not ready yet. > At this point dev_err() will have no output. > > Signed-off-by: Minjie Du <duminjie@vivo.com> > --- > drivers/spi/spi-fsl-dspi.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c > index ca41c8a8b..6aaa529b7 100644 > --- a/drivers/spi/spi-fsl-dspi.c > +++ b/drivers/spi/spi-fsl-dspi.c > @@ -503,15 +503,14 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr) > > dma->chan_rx = dma_request_chan(dev, "rx"); > if (IS_ERR(dma->chan_rx)) { > - dev_err(dev, "rx dma channel not available\n"); > - ret = PTR_ERR(dma->chan_rx); > - return ret; > + return dev_err_probe(dev, PTR_ERR(dma->chan_rx), > + "rx dma channel not available\n"); This does not have correct alignment either. Tabs are supposed to be rendered using 8 spaces. > } > > dma->chan_tx = dma_request_chan(dev, "tx"); > if (IS_ERR(dma->chan_tx)) { > - dev_err(dev, "tx dma channel not available\n"); > ret = PTR_ERR(dma->chan_tx); > + dev_err_probe(dev, ret, "tx dma channel not available\n"); > goto err_tx_channel; > } > > -- > 2.39.0 >
Tue, Jul 25, 2023 at 11:50:37AM +0800, Minjie Du kirjoitti: > It is possible for dma_request_chan() to return EPROBE_DEFER, which means > dev is not ready yet. > At this point dev_err() will have no output. ... > if (IS_ERR(dma->chan_tx)) { > - dev_err(dev, "tx dma channel not available\n"); > ret = PTR_ERR(dma->chan_tx); > + dev_err_probe(dev, ret, "tx dma channel not available\n"); It can be even simpler ret = dev_err_probe(dev, PTR_ERR(dma->chan_tx), "tx dma channel not available\n"); > goto err_tx_channel; > }
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index ca41c8a8b..6aaa529b7 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -503,15 +503,14 @@ static int dspi_request_dma(struct fsl_dspi *dspi, phys_addr_t phy_addr) dma->chan_rx = dma_request_chan(dev, "rx"); if (IS_ERR(dma->chan_rx)) { - dev_err(dev, "rx dma channel not available\n"); - ret = PTR_ERR(dma->chan_rx); - return ret; + return dev_err_probe(dev, PTR_ERR(dma->chan_rx), + "rx dma channel not available\n"); } dma->chan_tx = dma_request_chan(dev, "tx"); if (IS_ERR(dma->chan_tx)) { - dev_err(dev, "tx dma channel not available\n"); ret = PTR_ERR(dma->chan_tx); + dev_err_probe(dev, ret, "tx dma channel not available\n"); goto err_tx_channel; }
It is possible for dma_request_chan() to return EPROBE_DEFER, which means dev is not ready yet. At this point dev_err() will have no output. Signed-off-by: Minjie Du <duminjie@vivo.com> --- drivers/spi/spi-fsl-dspi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)