soundwire: bus: rename sdw_bus_master_add/delete, add arguments
In preparation for future extensions, rename functions to use sdw_bus_master prefix and add a parent and fwnode argument to sdw_bus_master_add to help with device registration in follow-up patches. No functionality change, just renames and additional arguments. The Intel code is currently unused, the two additional arguments are only needed for compilation. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Acked-by: Jaroslav Kysela <perex@perex.cz> Link: https://lore.kernel.org/r/20200518174322.31561-2-yung-chuan.liao@linux.intel.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:

committed by
Vinod Koul

parent
6f7219fecf
commit
5cab3ff248
@@ -822,7 +822,7 @@ static int qcom_swrm_probe(struct platform_device *pdev)
|
||||
goto err_clk;
|
||||
}
|
||||
|
||||
ret = sdw_add_bus_master(&ctrl->bus);
|
||||
ret = sdw_bus_master_add(&ctrl->bus, dev, dev->fwnode);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to register Soundwire controller (%d)\n",
|
||||
ret);
|
||||
@@ -841,7 +841,7 @@ static int qcom_swrm_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
|
||||
err_master_add:
|
||||
sdw_delete_bus_master(&ctrl->bus);
|
||||
sdw_bus_master_delete(&ctrl->bus);
|
||||
err_clk:
|
||||
clk_disable_unprepare(ctrl->hclk);
|
||||
err_init:
|
||||
@@ -852,7 +852,7 @@ static int qcom_swrm_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(&pdev->dev);
|
||||
|
||||
sdw_delete_bus_master(&ctrl->bus);
|
||||
sdw_bus_master_delete(&ctrl->bus);
|
||||
clk_disable_unprepare(ctrl->hclk);
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user