]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
soundwire: bus: suppress probe deferral errors
authorJohan Hovold <johan+linaro@kernel.org>
Fri, 12 Jul 2024 14:07:59 +0000 (16:07 +0200)
committerVinod Koul <vkoul@kernel.org>
Wed, 31 Jul 2024 06:57:45 +0000 (12:27 +0530)
Soundwire driver probe errors are currently being logged both by the bus
code and driver core:

wsa884x-codec sdw:4:0:0217:0204:00:0: Probe of wsa884x-codec failed: -12
wsa884x-codec sdw:4:0:0217:0204:00:0: probe with driver wsa884x-codec failed with error -12

Drop the redundant bus error message, which is also incorrectly being
logged on probe deferral:

wsa884x-codec sdw:4:0:0217:0204:00:0: Probe of wsa884x-codec failed: -517

Note that no soundwire driver uses the driver struct name field, which
will be removed by a follow-on change.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20240712140801.24267-2-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/soundwire/bus_type.c

index d928258c6761550cf9c9d39753704bbeeeef1ab4..6b1c8c8171026f4ce933c16bfcc827cd9e49b669 100644 (file)
@@ -83,7 +83,6 @@ static int sdw_drv_probe(struct device *dev)
        struct sdw_slave *slave = dev_to_sdw_dev(dev);
        struct sdw_driver *drv = drv_to_sdw_driver(dev->driver);
        const struct sdw_device_id *id;
-       const char *name;
        int ret;
 
        /*
@@ -108,11 +107,6 @@ static int sdw_drv_probe(struct device *dev)
 
        ret = drv->probe(slave, id);
        if (ret) {
-               name = drv->name;
-               if (!name)
-                       name = drv->driver.name;
-
-               dev_err(dev, "Probe of %s failed: %d\n", name, ret);
                dev_pm_domain_detach(dev, false);
                return ret;
        }