mirrors/linux
0
0 Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-10-26 10:57:38 +08:00
Code Activity

ALSA: parisc: harmony: Use devres card management

Browse Source 
The harmony driver's remove callback is nothing but a simple
snd_card_free() call, so let's use the devres for managing the card,
for simplifying the handling.

Now the card is created via snd_devm_card_new() that is auto-cleaned
up at probe for errors.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20261003105719.1070427-5-tiwai@suse.de
This commit is contained in:
Takashi Iwai committed 2026-10-04 20:29:48 +02:00
1 parent e81f85fd3c
commit 519dd2e50c
1 file changed
+7 -17
Download Patch File Download Diff File Expand all files Collapse all files
sound/parisc/harmony.c
+7 -17
View File
@@ -897,24 +897,24 @@ static int __init
snd_harmony_probe(struct parisc_device *padev)
{
int err;
struct snd_card *card;
struct snd_card *card __free(snd_card_free) = NULL;
struct snd_harmony *h;
err = snd_card_new(&padev->dev, index, id, THIS_MODULE, 0, &card);
err = snd_devm_card_new(&padev->dev, index, id, THIS_MODULE, 0, &card);
if (err < 0)
return err;
err = snd_harmony_create(card, padev, &h);
if (err < 0)
goto free_and_ret;
return err;
err = snd_harmony_pcm_init(h);
if (err < 0)
goto free_and_ret;
return err;
err = snd_harmony_mixer_init(h);
if (err < 0)
goto free_and_ret;
return err;
strscpy(card->driver, "harmony");
strscpy(card->shortname, "Harmony");
@@ -923,27 +923,17 @@ snd_harmony_probe(struct parisc_device *padev)
err = snd_card_register(card);
if (err < 0)
goto free_and_ret;
return err;
parisc_set_drvdata(padev, card);
card = NULL; /* probe succeeded, don't release as error */
return 0;
free_and_ret:
snd_card_free(card);
return err;
}
static void __exit
snd_harmony_remove(struct parisc_device *padev)
{
snd_card_free(parisc_get_drvdata(padev));
}
static struct parisc_driver snd_harmony_driver __refdata = {
.name = "harmony",
.id_table = snd_harmony_devtable,
.probe = snd_harmony_probe,
.remove = __exit_p(snd_harmony_remove),
};
static int __init