ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: ad1848: Allocate resources with device-managed APIs

Browse Source 
This patch converts the resource management in ISA ad1848 driver with
devres as a clean up.  Each manual resource management is converted
with the corresponding devres helper.  The remove callback became
superfluous and dropped.

This should give no user-visible functional changes.

Link: https://lore.kernel.org/r/20210715075941.23332-56-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2021-07-15 09:59:17 +02:00
parent 5eab6cb034
commit e031577eef
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sound/isa/ad1848/ad1848.c
View File

@@ -72,7 +72,7 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n)
struct snd_wss *chip; struct snd_wss *chip;
int error; int error;
error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card); error = snd_devm_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card);
if (error < 0) if (error < 0)
return error; return error;
@@ -80,17 +80,17 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n)
thinkpad[n] ? WSS_HW_THINKPAD : WSS_HW_DETECT, thinkpad[n] ? WSS_HW_THINKPAD : WSS_HW_DETECT,
0, &chip); 0, &chip);
if (error < 0) if (error < 0)
goto out; return error;
card->private_data = chip; card->private_data = chip;
error = snd_wss_pcm(chip, 0); error = snd_wss_pcm(chip, 0);
if (error < 0) if (error < 0)
goto out; return error;
error = snd_wss_mixer(chip); error = snd_wss_mixer(chip);
if (error < 0) if (error < 0)
goto out; return error;
strscpy(card->driver, "AD1848", sizeof(card->driver)); strscpy(card->driver, "AD1848", sizeof(card->driver));
strscpy(card->shortname, chip->pcm->name, sizeof(card->shortname)); strscpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
@@ -106,18 +106,10 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n)
error = snd_card_register(card); error = snd_card_register(card);
if (error < 0) if (error < 0)
goto out; return error;
dev_set_drvdata(dev, card); dev_set_drvdata(dev, card);
return 0; return 0;
out: snd_card_free(card);
return error;
}
static void snd_ad1848_remove(struct device *dev, unsigned int n)
{
snd_card_free(dev_get_drvdata(dev));
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
@@ -145,7 +137,6 @@ static int snd_ad1848_resume(struct device *dev, unsigned int n)
static struct isa_driver snd_ad1848_driver = { static struct isa_driver snd_ad1848_driver = {
.match = snd_ad1848_match, .match = snd_ad1848_match,
.probe = snd_ad1848_probe, .probe = snd_ad1848_probe,
.remove = snd_ad1848_remove,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = snd_ad1848_suspend, .suspend = snd_ad1848_suspend,
.resume = snd_ad1848_resume, .resume = snd_ad1848_resume,