From: Takashi Iwai <tiwai@suse.de>
To: linux-sound@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 12/32] ALSA: cs5535audio: Use auto-cleanup for probe card error handling
Date: Thu, 1 Oct 2026 13:03:52 +0200 [thread overview]
Message-ID: <20261001110447.486782-13-tiwai@suse.de> (raw)
In-Reply-To: <20261001110447.486782-1-tiwai@suse.de>
Instead of the manual call of snd_card_free_on_error(), use the
auto-cleanup feature.
Merely a code cleanup, and no functional changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/pci/cs5535audio/cs5535audio.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 0ebf6c02b1ef..a11faef4ab75 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -283,11 +283,11 @@ static int snd_cs5535audio_create(struct snd_card *card,
return 0;
}
-static int __snd_cs5535audio_probe(struct pci_dev *pci,
- const struct pci_device_id *pci_id)
+static int snd_cs5535audio_probe(struct pci_dev *pci,
+ const struct pci_device_id *pci_id)
{
static int dev;
- struct snd_card *card;
+ struct snd_card *card __free(snd_card_unref) = NULL;
struct cs5535audio *cs5535au;
int err;
@@ -329,16 +329,11 @@ static int __snd_cs5535audio_probe(struct pci_dev *pci,
return err;
pci_set_drvdata(pci, card);
+ card = NULL; /* probe succeeded, don't release as error */
dev++;
return 0;
}
-static int snd_cs5535audio_probe(struct pci_dev *pci,
- const struct pci_device_id *pci_id)
-{
- return snd_card_free_on_error(&pci->dev, __snd_cs5535audio_probe(pci, pci_id));
-}
-
static struct pci_driver cs5535audio_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_cs5535audio_ids,
--
2.55.0
next prev parent reply other threads:[~2026-10-01 11:05 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-01 11:03 [PATCH 00/32] ALSA: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 01/32] ALSA: galaxy: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 02/32] ALSA: sc6000: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 03/32] ALSA: ad1889: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 04/32] ALSA: ali5451: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 05/32] ALSA: als4000: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 06/32] ALSA: atiixp: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 07/32] ALSA: au88x0: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 08/32] ALSA: azt3328: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 09/32] ALSA: bt87x: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 10/32] ALSA: ca0106: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 11/32] ALSA: cs4281: " Takashi Iwai
2026-10-01 11:03 ` Takashi Iwai [this message]
2026-10-01 11:03 ` [PATCH 13/32] ALSA: echoaudio: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 14/32] ALSA: emu10k1x: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 15/32] ALSA: ens137x: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 16/32] ALSA: es1938: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 17/32] ALSA: es1968: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 18/32] ALSA: fm801: " Takashi Iwai
2026-10-01 11:03 ` [PATCH 19/32] ALSA: ice1724: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 20/32] ALSA: intel8x0: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 21/32] ALSA: lola: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 22/32] ALSA: maestro3: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 23/32] ALSA: oxygen: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 24/32] ALSA: riptide: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 25/32] ALSA: rme32: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 26/32] ALSA: rm96: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 27/32] ALSA: sis7019: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 28/32] ALSA: sonicbibes: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 29/32] ALSA: via82xx: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 30/32] ALSA: ymfpci: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 31/32] ALSA: intel-hdmi-audio: " Takashi Iwai
2026-10-01 11:04 ` [PATCH 32/32] ALSA: Drop unused snd_card_free_on_error() Takashi Iwai
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=20261001110447.486782-13-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
/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®