On 11/3/19 12:30 AM, Vinod Koul wrote:
On 23-10-19, 16:28, Pierre-Louis Bossart wrote:
Before we add master driver support, make sure there is no ambiguity and no occirrences of sdw_drv_ functions.
^^^^^^^^^^^typo
Ack, will fix.
No functionality change.
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com
drivers/soundwire/bus_type.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index 2b2830b622fa..9a0fd3ee1014 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c @@ -67,7 +67,7 @@ struct bus_type sdw_bus_type = { }; EXPORT_SYMBOL_GPL(sdw_bus_type);
-static int sdw_drv_probe(struct device *dev) +static int sdw_slave_drv_probe(struct device *dev) { struct sdw_slave *slave = to_sdw_slave_device(dev); struct sdw_driver *drv = to_sdw_slave_driver(dev->driver); @@ -113,7 +113,7 @@ static int sdw_drv_probe(struct device *dev) return 0; }
-static int sdw_drv_remove(struct device *dev) +static int sdw_slave_drv_remove(struct device *dev) { struct sdw_slave *slave = to_sdw_slave_device(dev); struct sdw_driver *drv = to_sdw_slave_driver(dev->driver); @@ -127,7 +127,7 @@ static int sdw_drv_remove(struct device *dev) return ret; }
-static void sdw_drv_shutdown(struct device *dev) +static void sdw_slave_drv_shutdown(struct device *dev) { struct sdw_slave *slave = to_sdw_slave_device(dev); struct sdw_driver *drv = to_sdw_slave_driver(dev->driver); @@ -155,13 +155,13 @@ int __sdw_register_slave_driver(struct sdw_driver *drv, }
drv->driver.owner = owner;
- drv->driver.probe = sdw_drv_probe;
drv->driver.probe = sdw_slave_drv_probe;
if (drv->remove)
drv->driver.remove = sdw_drv_remove;
drv->driver.remove = sdw_slave_drv_remove;if (drv->shutdown)
drv->driver.shutdown = sdw_drv_shutdown;
drv->driver.shutdown = sdw_slave_drv_shutdown;return driver_register(&drv->driver); }
-- 2.20.1