From: Yang Yingliang <yangyingliang@huawei.com>
To: <linux-kernel@vger.kernel.org>, <alsa-devel@alsa-project.org>
Cc: <venkataprasad.potturu@amd.com>, <Vijendar.Mukunda@amd.com>,
<broonie@kernel.org>
Subject: [PATCH -next 3/3] ASoC: amd: acp: add a label to make error path more clean
Date: Fri, 19 Aug 2022 15:37:58 +0800 [thread overview]
Message-ID: <20220819073758.1273160-3-yangyingliang@huawei.com> (raw)
In-Reply-To: <20220819073758.1273160-1-yangyingliang@huawei.com>
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
next prev parent reply other threads:[~2022-08-19 7:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-19 7:37 [PATCH -next 1/3] ASoC: amd: acp: add missing platform_device_unregister() in acp_pci_probe() Yang Yingliang
2022-08-19 7:37 ` [PATCH -next 2/3] ASoC: amd: acp: switch to use dev_err_probe() Yang Yingliang
2022-08-19 7:37 ` Yang Yingliang [this message]
2022-08-19 22:47 ` [PATCH -next 1/3] ASoC: amd: acp: add missing platform_device_unregister() in acp_pci_probe() Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220819073758.1273160-3-yangyingliang@huawei.com \
--to=yangyingliang@huawei.com \
--cc=Vijendar.Mukunda@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=venkataprasad.potturu@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®