| Message ID | 20230602-pl022-defer-fix-v2-1-383f6bc2293a@axis.com |
|---|---|
| State | Accepted |
| Commit | 8098a931c080d32687aee72a1dfac98507a6034b |
| Headers | show |
| Series | [v2] spi: spl022: Probe defer is no error | expand |
On Fri, Jun 2, 2023 at 8:13 PM Mårten Lindahl <marten.lindahl@axis.com> wrote: > When the spi controller is registered and the cs_gpiods cannot be > assigned, causing a defer of the probe, there is an error print saying: > "probe - problem registering spi master" > > This should not be announced as an error. Print this message for all > errors except for the probe defer. > > Signed-off-by: Mårten Lindahl <marten.lindahl@axis.com> Excellent, thanks! Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On Fri, 02 Jun 2023 20:12:54 +0200, Mårten Lindahl wrote: > When the spi controller is registered and the cs_gpiods cannot be > assigned, causing a defer of the probe, there is an error print saying: > "probe - problem registering spi master" > > This should not be announced as an error. Print this message for all > errors except for the probe defer. > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next Thanks! [1/1] spi: spl022: Probe defer is no error commit: 8098a931c080d32687aee72a1dfac98507a6034b 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
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 982407bc5d9f..1af75eff26b6 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2217,8 +2217,8 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id) amba_set_drvdata(adev, pl022); status = devm_spi_register_master(&adev->dev, master); if (status != 0) { - dev_err(&adev->dev, - "probe - problem registering spi master\n"); + dev_err_probe(&adev->dev, status, + "problem registering spi master\n"); goto err_spi_register; } dev_dbg(dev, "probe succeeded\n");
When the spi controller is registered and the cs_gpiods cannot be assigned, causing a defer of the probe, there is an error print saying: "probe - problem registering spi master" This should not be announced as an error. Print this message for all errors except for the probe defer. Signed-off-by: Mårten Lindahl <marten.lindahl@axis.com> --- Changes in v2: - Use dev_err_probe instead of standalone check with print. - Link to v1: https://lore.kernel.org/r/20230602-pl022-defer-fix-v1-1-b80bfca3e1b4@axis.com --- drivers/spi/spi-pl022.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: 7877cb91f1081754a1487c144d85dc0d2e2e7fc4 change-id: 20230602-pl022-defer-fix-0f8b8c0b6eff Best regards,