]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
driver core: Make dev_err_probe() silent for -ENOMEM
authorUwe Kleine-König <u.kleine-koenig@baylibre.com>
Thu, 13 Jun 2024 21:23:52 +0000 (23:23 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 20 Jun 2024 10:48:09 +0000 (12:48 +0200)
For an out-of-memory error there should be no additional output. Adapt
dev_err_probe() to not emit the error message when err is -ENOMEM.
This simplifies handling errors that might among others be -ENOMEM.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/3d1e308d45cddf67749522ca42d83f5b4f0b9634.1718311756.git.u.kleine-koenig@baylibre.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/core.c

index 2b4c0624b7043af9eea7d59153a3c1e657b19e1e..730cae66607c02530d456b61344d431dc313c031 100644 (file)
@@ -5021,11 +5021,22 @@ int dev_err_probe(const struct device *dev, int err, const char *fmt, ...)
        vaf.fmt = fmt;
        vaf.va = &args;
 
-       if (err != -EPROBE_DEFER) {
-               dev_err(dev, "error %pe: %pV", ERR_PTR(err), &vaf);
-       } else {
+       switch (err) {
+       case -EPROBE_DEFER:
                device_set_deferred_probe_reason(dev, &vaf);
                dev_dbg(dev, "error %pe: %pV", ERR_PTR(err), &vaf);
+               break;
+
+       case -ENOMEM:
+               /*
+                * We don't print anything on -ENOMEM, there is already enough
+                * output.
+                */
+               break;
+
+       default:
+               dev_err(dev, "error %pe: %pV", ERR_PTR(err), &vaf);
+               break;
        }
 
        va_end(args);