Skip to content

Commit 1b6180c

Browse files
saba-kareembroonie
authored andcommitted
ASoC: amd: acp: change acp-deinit function arguments
acp-deinit function will not be same for all platforms. To make platform specific changes in acp-deinit function, instead of passing base address pass chip structure which contains acp_rev feild. chip->acp_rev will be used to add platform specific code in acp-deinit(). Signed-off-by: Syed Saba Kareem <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 39d9ee4 commit 1b6180c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

sound/soc/amd/acp/acp-legacy-common.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -320,16 +320,16 @@ int acp_init(struct acp_chip_info *chip)
320320
}
321321
EXPORT_SYMBOL_NS_GPL(acp_init, SND_SOC_ACP_COMMON);
322322

323-
int acp_deinit(void __iomem *base)
323+
int acp_deinit(struct acp_chip_info *chip)
324324
{
325325
int ret;
326326

327327
/* Reset */
328-
ret = acp_reset(base);
328+
ret = acp_reset(chip->base);
329329
if (ret)
330330
return ret;
331331

332-
writel(0, base + ACP_CONTROL);
332+
writel(0, chip->base + ACP_CONTROL);
333333
return 0;
334334
}
335335
EXPORT_SYMBOL_NS_GPL(acp_deinit, SND_SOC_ACP_COMMON);

sound/soc/amd/acp/acp-pci.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static int __maybe_unused snd_acp_suspend(struct device *dev)
178178
int ret;
179179

180180
chip = dev_get_drvdata(dev);
181-
ret = acp_deinit(chip->base);
181+
ret = acp_deinit(chip);
182182
if (ret)
183183
dev_err(dev, "ACP de-init failed\n");
184184
return ret;
@@ -219,7 +219,7 @@ static void acp_pci_remove(struct pci_dev *pci)
219219
platform_device_unregister(dmic_dev);
220220
if (pdev)
221221
platform_device_unregister(pdev);
222-
ret = acp_deinit(chip->base);
222+
ret = acp_deinit(chip);
223223
if (ret)
224224
dev_err(&pci->dev, "ACP de-init failed\n");
225225
}

sound/soc/amd/acp/amd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ int smn_read(struct pci_dev *dev, u32 smn_addr);
222222
int smn_write(struct pci_dev *dev, u32 smn_addr, u32 data);
223223

224224
int acp_init(struct acp_chip_info *chip);
225-
int acp_deinit(void __iomem *base);
225+
int acp_deinit(struct acp_chip_info *chip);
226226
void acp_enable_interrupts(struct acp_dev_data *adata);
227227
void acp_disable_interrupts(struct acp_dev_data *adata);
228228
/* Machine configuration */

0 commit comments

Comments
 (0)