Skip to content

Commit 12679b9

Browse files
committed
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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
1 parent 9949764 commit 12679b9

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

drivers/soundwire/bus_type.c

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ static int sdw_drv_probe(struct device *dev)
8282
struct sdw_slave *slave = dev_to_sdw_dev(dev);
8383
struct sdw_driver *drv = drv_to_sdw_driver(dev->driver);
8484
const struct sdw_device_id *id;
85+
const char *name;
8586
int ret;
8687

8788
/*
@@ -108,7 +109,10 @@ static int sdw_drv_probe(struct device *dev)
108109

109110
ret = drv->probe(slave, id);
110111
if (ret) {
111-
dev_err(dev, "Probe of %s failed: %d\n", drv->name, ret);
112+
name = drv->name;
113+
if (!name)
114+
name = drv->driver.name;
115+
dev_err(dev, "Probe of %s failed: %d\n", name, ret);
112116
dev_pm_domain_detach(dev, false);
113117
return ret;
114118
}
@@ -174,11 +178,16 @@ static void sdw_drv_shutdown(struct device *dev)
174178
*/
175179
int __sdw_register_driver(struct sdw_driver *drv, struct module *owner)
176180
{
181+
const char *name;
182+
177183
drv->driver.bus = &sdw_bus_type;
178184

179185
if (!drv->probe) {
180-
pr_err("driver %s didn't provide SDW probe routine\n",
181-
drv->name);
186+
name = drv->name;
187+
if (!name)
188+
name = drv->driver.name;
189+
190+
pr_err("driver %s didn't provide SDW probe routine\n", name);
182191
return -EINVAL;
183192
}
184193

0 commit comments

Comments
 (0)