Blaster4385/linux-IllusionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

soundwire: bus: use correct driver name in error messages

Browse source 
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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: Bard 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: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2021-03-02 17:11:12 +08:00 committed by Vinod Koul
parent e6cb15b500
commit 0196b52b83
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/soundwire/bus_type.c
View file

@ -82,6 +82,7 @@ static int sdw_drv_probe(struct device *dev)
struct sdw_slave *slave = dev_to_sdw_dev(dev); struct sdw_slave *slave = dev_to_sdw_dev(dev);
struct sdw_driver *drv = drv_to_sdw_driver(dev->driver); struct sdw_driver *drv = drv_to_sdw_driver(dev->driver);
const struct sdw_device_id *id; const struct sdw_device_id *id;
const char *name;
int ret; int ret;
/* /*
@ -108,7 +109,10 @@ static int sdw_drv_probe(struct device *dev)
ret = drv->probe(slave, id); ret = drv->probe(slave, id);
if (ret) { 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); dev_pm_domain_detach(dev, false);
return ret; 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) int __sdw_register_driver(struct sdw_driver *drv, struct module *owner)
{ {
const char *name;
drv->driver.bus = &sdw_bus_type; drv->driver.bus = &sdw_bus_type;
if (!drv->probe) { if (!drv->probe) {
pr_err("driver %s didn't provide SDW probe routine\n", name = drv->name;
drv->name); if (!name)
name = drv->driver.name;
pr_err("driver %s didn't provide SDW probe routine\n", name);
return -EINVAL; return -EINVAL;
} }