Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

usb: gadget: Convert to snd_card_new() with a device pointer 



Also remove superfluous snd_card_set_dev() calls.

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

drivers/usb/gadget/f_midi.c

+3 −4
Original line number Diff line number Diff line
@@ -664,9 +664,10 @@ static int f_midi_register_card(struct f_midi *midi) 
		.dev_free = f_midi_snd_free,

	};



	err = snd_card_create(midi->index, midi->id, THIS_MODULE, 0, &card);

	err = snd_card_new(&midi->gadget->dev, midi->index, midi->id,

			   THIS_MODULE, 0, &card);

	if (err < 0) {

		ERROR(midi, "snd_card_create() failed\n");

		ERROR(midi, "snd_card_new() failed\n");

		goto fail;

	}

	midi->card = card;
@@ -703,8 +704,6 @@ static int f_midi_register_card(struct f_midi *midi) 
	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &gmidi_in_ops);

	snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &gmidi_out_ops);



	snd_card_set_dev(card, &midi->gadget->dev);



	/* register it - we're ready to go */

	err = snd_card_register(card);

	if (err < 0) {

drivers/usb/gadget/f_uac2.c

+1 −3
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ static int snd_uac2_probe(struct platform_device *pdev) 
	int err;



	/* Choose any slot, with no id */

	err = snd_card_create(-1, NULL, THIS_MODULE, 0, &card);

	err = snd_card_new(&pdev->dev, -1, NULL, THIS_MODULE, 0, &card);

	if (err < 0)

		return err;
@@ -421,8 +421,6 @@ static int snd_uac2_probe(struct platform_device *pdev) 
	strcpy(card->shortname, "UAC2_Gadget");

	sprintf(card->longname, "UAC2_Gadget %i", pdev->id);



	snd_card_set_dev(card, &pdev->dev);



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS,

		snd_dma_continuous_data(GFP_KERNEL), 0, BUFF_SIZE_MAX);