Commit 0196b52b authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Vinod Koul
Browse files

soundwire: bus: use correct driver name in error messages 



None of the existing codec drivers set the sdw_driver.name, but
instead set sdw_driver.driver.name.

This leads to error messages such as
[   23.935355] rt700 sdw:2:25d:700:0: Probe of (null) failed: -19

We could remove this sdw_driver.name if it doesn't have any
purpose. This patch only suggests using the proper indirection.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20210302091122.13952-2-yung-chuan.liao@linux.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent e6cb15b5

drivers/soundwire/bus_type.c

+12 −3
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ 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,7 +109,10 @@ static int sdw_drv_probe(struct device *dev) 


	ret = drv->probe(slave, id);

	if (ret) {

		dev_err(dev, "Probe of %s failed: %d\n", drv->name, 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;

	}
@@ -174,11 +178,16 @@ static void sdw_drv_shutdown(struct device *dev) 
 */

int __sdw_register_driver(struct sdw_driver *drv, struct module *owner)

{

	const char *name;



	drv->driver.bus = &sdw_bus_type;



	if (!drv->probe) {

		pr_err("driver %s didn't provide SDW probe routine\n",

		       drv->name);

		name = drv->name;

		if (!name)

			name = drv->driver.name;



		pr_err("driver %s didn't provide SDW probe routine\n", name);

		return -EINVAL;

	}