Commit 45782ce0 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: cmi8330: Allocate resources with device-managed APIs 

This patch converts the resource management in ISA cmi8330 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-61-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d9fd7397

sound/isa/cmi8330.c

+4 −23
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static int snd_cmi8330_card_new(struct device *pdev, int dev, 
	struct snd_cmi8330 *acard;

	int err;



	err = snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,

	err = snd_devm_card_new(pdev, index[dev], id[dev], THIS_MODULE,

				sizeof(struct snd_cmi8330), &card);

	if (err < 0) {

		snd_printk(KERN_ERR PFX "could not get a new card\n");
@@ -629,20 +629,12 @@ static int snd_cmi8330_isa_probe(struct device *pdev, 
	if (err < 0)

		return err;

	err = snd_cmi8330_probe(card, dev);

	if (err < 0) {

		snd_card_free(card);

	if (err < 0)

		return err;

	}

	dev_set_drvdata(pdev, card);

	return 0;

}



static void snd_cmi8330_isa_remove(struct device *devptr,

				  unsigned int dev)

{

	snd_card_free(dev_get_drvdata(devptr));

}



#ifdef CONFIG_PM

static int snd_cmi8330_isa_suspend(struct device *dev, unsigned int n,

				   pm_message_t state)
@@ -661,7 +653,6 @@ static int snd_cmi8330_isa_resume(struct device *dev, unsigned int n) 
static struct isa_driver snd_cmi8330_driver = {

	.match		= snd_cmi8330_isa_match,

	.probe		= snd_cmi8330_isa_probe,

	.remove		= snd_cmi8330_isa_remove,

#ifdef CONFIG_PM

	.suspend	= snd_cmi8330_isa_suspend,

	.resume		= snd_cmi8330_isa_resume,
@@ -693,25 +684,16 @@ static int snd_cmi8330_pnp_detect(struct pnp_card_link *pcard, 
	res = snd_cmi8330_pnp(dev, card->private_data, pcard, pid);

	if (res < 0) {

		snd_printk(KERN_ERR PFX "PnP detection failed\n");

		snd_card_free(card);

		return res;

	}

	res = snd_cmi8330_probe(card, dev);

	if (res < 0) {

		snd_card_free(card);

	if (res < 0)

		return res;

	}

	pnp_set_card_drvdata(pcard, card);

	dev++;

	return 0;

}



static void snd_cmi8330_pnp_remove(struct pnp_card_link *pcard)

{

	snd_card_free(pnp_get_card_drvdata(pcard));

	pnp_set_card_drvdata(pcard, NULL);

}



#ifdef CONFIG_PM

static int snd_cmi8330_pnp_suspend(struct pnp_card_link *pcard, pm_message_t state)

{
@@ -729,7 +711,6 @@ static struct pnp_card_driver cmi8330_pnpc_driver = { 
	.name = "cmi8330",

	.id_table = snd_cmi8330_pnpids,

	.probe = snd_cmi8330_pnp_detect,

	.remove = snd_cmi8330_pnp_remove,

#ifdef CONFIG_PM

	.suspend	= snd_cmi8330_pnp_suspend,

	.resume		= snd_cmi8330_pnp_resume,