Commit ed16a22b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: dummy: Allocate resources with device-managed APIs 

Use the new snd_devm_card_new() for the card object allocation, and
clean up the superfluous remove callback.

Link: https://lore.kernel.org/r/20210715075941.23332-79-tiwai@suse.de


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

sound/drivers/dummy.c

+7 −17
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ static int snd_dummy_probe(struct platform_device *devptr) 
	int idx, err;

	int dev = devptr->id;



	err = snd_card_new(&devptr->dev, index[dev], id[dev], THIS_MODULE,

	err = snd_devm_card_new(&devptr->dev, index[dev], id[dev], THIS_MODULE,

				sizeof(struct snd_dummy), &card);

	if (err < 0)

		return err;
@@ -1047,7 +1047,7 @@ static int snd_dummy_probe(struct platform_device *devptr) 
			pcm_substreams[dev] = MAX_PCM_SUBSTREAMS;

		err = snd_card_dummy_pcm(dummy, idx, pcm_substreams[dev]);

		if (err < 0)

			goto __nodev;

			return err;

	}



	dummy->pcm_hw = dummy_pcm_hardware;
@@ -1078,7 +1078,7 @@ static int snd_dummy_probe(struct platform_device *devptr) 


	err = snd_card_dummy_new_mixer(dummy);

	if (err < 0)

		goto __nodev;

		return err;

	strcpy(card->driver, "Dummy");

	strcpy(card->shortname, "Dummy");

	sprintf(card->longname, "Dummy %i", dev + 1);
@@ -1086,18 +1086,9 @@ static int snd_dummy_probe(struct platform_device *devptr) 
	dummy_proc_init(dummy);



	err = snd_card_register(card);

	if (err == 0) {

		platform_set_drvdata(devptr, card);

		return 0;

	}

      __nodev:

	snd_card_free(card);

	if (err < 0)

		return err;

}



static int snd_dummy_remove(struct platform_device *devptr)

{

	snd_card_free(platform_get_drvdata(devptr));

	platform_set_drvdata(devptr, card);

	return 0;

}
@@ -1128,7 +1119,6 @@ static SIMPLE_DEV_PM_OPS(snd_dummy_pm, snd_dummy_suspend, snd_dummy_resume); 


static struct platform_driver snd_dummy_driver = {

	.probe		= snd_dummy_probe,

	.remove		= snd_dummy_remove,

	.driver		= {

		.name	= SND_DUMMY_DRIVER,

		.pm	= SND_DUMMY_PM_OPS,