ASoC: amd: acp: add a label to make error path more clean
authorYang Yingliang <yangyingliang@huawei.com>
Fri, 19 Aug 2022 07:37:58 +0000 (15:37 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 19 Aug 2022 12:19:58 +0000 (13:19 +0100)
Move platform_device_unregister() to a new label to make code more clean.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20220819073758.1273160-3-yangyingliang@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/amd/acp/acp-pci.c

index 691350646f1bb26113dce6867339a76f7fd35bff..ef2ce083521e96e30bb4351ff91cb734f7fae194 100644 (file)
@@ -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: