Skip to content

Commit 6dfbafd

Browse files
jhovoldvinodkoul
authored andcommitted
soundwire: bus: drop unused driver name field
The soundwire driver name field is not currently used by any driver (and even appears to never have been used) so drop it. Signed-off-by: Johan Hovold <[email protected]> Reviewed-by: Pierre-Louis Bossart <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent d9a2b5e commit 6dfbafd

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

drivers/soundwire/bus_type.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -198,16 +198,11 @@ static void sdw_drv_shutdown(struct device *dev)
198198
*/
199199
int __sdw_register_driver(struct sdw_driver *drv, struct module *owner)
200200
{
201-
const char *name;
202-
203201
drv->driver.bus = &sdw_bus_type;
204202

205203
if (!drv->probe) {
206-
name = drv->name;
207-
if (!name)
208-
name = drv->driver.name;
209-
210-
pr_err("driver %s didn't provide SDW probe routine\n", name);
204+
pr_err("driver %s didn't provide SDW probe routine\n",
205+
drv->driver.name);
211206
return -EINVAL;
212207
}
213208

include/linux/soundwire/sdw.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -704,8 +704,6 @@ struct sdw_master_device {
704704
container_of(d, struct sdw_master_device, dev)
705705

706706
struct sdw_driver {
707-
const char *name;
708-
709707
int (*probe)(struct sdw_slave *sdw,
710708
const struct sdw_device_id *id);
711709
int (*remove)(struct sdw_slave *sdw);

0 commit comments

Comments
 (0)