2023-06-02 11:24:10

by Mårten Lindahl

[permalink] [raw]
Subject: [PATCH] spi: spl022: Probe defer is no error

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 <[email protected]>
---
drivers/spi/spi-pl022.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c
index 982407bc5d9f..520471dfeb11 100644
--- a/drivers/spi/spi-pl022.c
+++ b/drivers/spi/spi-pl022.c
@@ -2217,8 +2217,9 @@ 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");
+ if (status != -EPROBE_DEFER)
+ dev_err(&adev->dev,
+ "probe - problem registering spi master\n");
goto err_spi_register;
}
dev_dbg(dev, "probe succeeded\n");

---
base-commit: 7877cb91f1081754a1487c144d85dc0d2e2e7fc4
change-id: 20230602-pl022-defer-fix-0f8b8c0b6eff

Best regards,
--
Mårten Lindahl <[email protected]>



2023-06-02 12:04:39

by Mårten Lindahl

[permalink] [raw]
Subject: Re: [PATCH] spi: spl022: Probe defer is no error

On 6/2/23 13:44, Mark Brown wrote:
> On Fri, Jun 02, 2023 at 01:11:51PM +0200, Mårten Lindahl wrote:
>
>> if (status != 0) {
>> - dev_err(&adev->dev,
>> - "probe - problem registering spi master\n");
>> + if (status != -EPROBE_DEFER)
>> + dev_err(&adev->dev,
>> + "probe - problem registering spi master\n");
> dev_err_probe().

Hi Mark!

Yes, that's even better. Thanks!

Kind regards

Mårten


2023-06-02 12:15:57

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] spi: spl022: Probe defer is no error

On Fri, Jun 02, 2023 at 01:11:51PM +0200, M?rten Lindahl wrote:

> if (status != 0) {
> - dev_err(&adev->dev,
> - "probe - problem registering spi master\n");
> + if (status != -EPROBE_DEFER)
> + dev_err(&adev->dev,
> + "probe - problem registering spi master\n");

dev_err_probe().


Attachments:
(No filename) (304.00 B)
signature.asc (499.00 B)
Download all attachments