Skip to content

Commit

Permalink
ALSA: ad1848: Allocate resources with device-managed APIs
Browse files Browse the repository at this point in the history
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/[email protected]
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
tiwai committed Jul 19, 2021
1 parent 5eab6cb commit e031577
Showing 1 changed file with 5 additions and 14 deletions.
19 changes: 5 additions & 14 deletions sound/isa/ad1848/ad1848.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,25 +72,25 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n)
struct snd_wss *chip;
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)
return error;

error = snd_wss_create(card, port[n], -1, irq[n], dma1[n], -1,
thinkpad[n] ? WSS_HW_THINKPAD : WSS_HW_DETECT,
0, &chip);
if (error < 0)
goto out;
return error;

card->private_data = chip;

error = snd_wss_pcm(chip, 0);
if (error < 0)
goto out;
return error;

error = snd_wss_mixer(chip);
if (error < 0)
goto out;
return error;

strscpy(card->driver, "AD1848", sizeof(card->driver));
strscpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
Expand All @@ -106,18 +106,10 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n)

error = snd_card_register(card);
if (error < 0)
goto out;
return error;

dev_set_drvdata(dev, card);
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
Expand Down Expand Up @@ -145,7 +137,6 @@ static int snd_ad1848_resume(struct device *dev, unsigned int n)
static struct isa_driver snd_ad1848_driver = {
.match = snd_ad1848_match,
.probe = snd_ad1848_probe,
.remove = snd_ad1848_remove,
#ifdef CONFIG_PM
.suspend = snd_ad1848_suspend,
.resume = snd_ad1848_resume,
Expand Down

0 comments on commit e031577

Please sign in to comment.