lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH -next 3/3] ASoC: amd: acp: add a label to make error path more clean
Date
Move platform_device_unregister() to a new label to make code more clean.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
sound/soc/amd/acp/acp-pci.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/sound/soc/amd/acp/acp-pci.c b/sound/soc/amd/acp/acp-pci.c
index 691350646f1b..ef2ce083521e 100644
--- a/sound/soc/amd/acp/acp-pci.c
+++ b/sound/soc/amd/acp/acp-pci.c
@@ -103,16 +103,14 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id
addr = pci_resource_start(pci, 0);
chip->base = devm_ioremap(&pci->dev, addr, pci_resource_len(pci, 0));
if (!chip->base) {
- platform_device_unregister(dmic_dev);
ret = -ENOMEM;
- goto release_regions;
+ goto unregister_dmic_dev;
}

res = devm_kzalloc(&pci->dev, sizeof(struct resource) * num_res, GFP_KERNEL);
if (!res) {
- platform_device_unregister(dmic_dev);
ret = -ENOMEM;
- goto release_regions;
+ goto unregister_dmic_dev;
}

for (i = 0; i < num_res; i++, res_acp++) {
@@ -139,13 +137,14 @@ static int acp_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id
pdev = platform_device_register_full(&pdevinfo);
if (IS_ERR(pdev)) {
dev_err(&pci->dev, "cannot register %s device\n", pdevinfo.name);
- platform_device_unregister(dmic_dev);
ret = PTR_ERR(pdev);
- goto release_regions;
+ goto unregister_dmic_dev;
}

return ret;

+unregister_dmic_dev:
+ platform_device_unregister(dmic_dev);
release_regions:
pci_release_regions(pci);
disable_pci:
--
2.25.1
\
 
 \ /
  Last update: 2022-08-19 09:31    [W:0.082 / U:0.136 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site