diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index 893296f3fe39..81c77e6ddbad 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -193,6 +193,7 @@ int __sdw_register_driver(struct sdw_driver *drv, struct module *owner)
drv->driver.owner = owner; drv->driver.probe = sdw_drv_probe;
drv->driver.dev_groups = sdw_attr_groups;
if (drv->remove) drv->driver.remove = sdw_drv_remove;
Minor rebase issue: this version of the bus_type.c code is no longer up-to-date, this patch creates a conflict with "soundwire: bus_type: fix remove and shutdown support" merged by Vinod - should be in your char-misc tree as well for 5.20.
++<<<<<<< HEAD
+ drv->driver.remove = sdw_drv_remove;
+ drv->driver.shutdown = sdw_drv_shutdown;
++=======
+ drv->driver.dev_groups = sdw_attr_groups;
+
+ if (drv->remove)
+ drv->driver.remove = sdw_drv_remove;
+
+ if (drv->shutdown)
+ drv->driver.shutdown = sdw_drv_shutdown;
++>>>>>>> soundwire: sysfs: have the driver core handle the creation of the device groups
Fixing it locally and testing.