diff options
| author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2024-02-19 18:26:59 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2024-02-20 12:51:48 +0100 |
| commit | d0f77d87f5fbfce7c16ace803491340258035a7f (patch) | |
| tree | 239bc56ece25f90017d93964e8a854c8b0e71109 /drivers/spi | |
| parent | ecab0d0bc4c9868190ee9d668b666fdea8ac6a9a (diff) | |
| download | barebox-d0f77d87f5fbfce7c16ace803491340258035a7f.tar.gz barebox-d0f77d87f5fbfce7c16ace803491340258035a7f.tar.xz | |
treewide: use dev_err_probe instead of comparisons against EPROBE_DEFER
Drivers should not need to compare an error value against EPROBE_DEFER.
We have a number of drivers doing that though to decide whether to print
an error or not. This error message will be lost if the probe is
deferred, so use dev_err_probe to store the error in that case.
While at it, we shorten the error messages a bit. dev_err_probe will
already print the string 'error' before the error code string.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.barebox.org/20240219172659.3796647-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/gpio_spi.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/spi/gpio_spi.c b/drivers/spi/gpio_spi.c index f751ab3078..e5664df3fe 100644 --- a/drivers/spi/gpio_spi.c +++ b/drivers/spi/gpio_spi.c @@ -136,12 +136,9 @@ static int gpio_spi_of_probe(struct device *dev) return 0; sck = of_get_named_gpio(np, "gpio-sck", 0); - if (sck == -EPROBE_DEFER) - return sck; - if (!gpio_is_valid(sck)) { - dev_err(dev, "missing mandatory SCK gpio\n"); - return sck; - } + if (!gpio_is_valid(sck)) + return dev_err_probe(dev, sck < 0 ? sck : -EINVAL, + "missing mandatory SCK gpio\n"); pdata = xzalloc(sizeof(*pdata)); pdata->sck = sck; |