Commit 7449054a authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb: Clean up with new procfs helpers 



Simplify the proc fs creation code with new helper functions,
snd_card_ro_proc_new() and snd_card_rw_proc_new().
Just a code refactoring and no functional changes.

Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3c6ee770

sound/usb/mixer.c

+3 −4
Original line number Diff line number Diff line
@@ -3441,7 +3441,6 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif, 
		.dev_free = snd_usb_mixer_dev_free

	};

	struct usb_mixer_interface *mixer;

	struct snd_info_entry *entry;

	int err;



	strcpy(chip->card->mixername, "USB Mixer");
@@ -3497,9 +3496,9 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif, 
	if (err < 0)

		goto _error;



	if (list_empty(&chip->mixer_list) &&

	    !snd_card_proc_new(chip->card, "usbmixer", &entry))

		snd_info_set_text_ops(entry, chip, snd_usb_mixer_proc_read);

	if (list_empty(&chip->mixer_list))

		snd_card_ro_proc_new(chip->card, "usbmixer", chip,

				     snd_usb_mixer_proc_read);



	list_add(&mixer->list, &chip->mixer_list);

	return 0;

sound/usb/mixer_quirks.c

+2 −4
Original line number Diff line number Diff line
@@ -2195,7 +2195,6 @@ static int snd_rme_controls_create(struct usb_mixer_interface *mixer) 
int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)

{

	int err = 0;

	struct snd_info_entry *entry;



	err = snd_usb_soundblaster_remote_init(mixer);

	if (err < 0)
@@ -2214,9 +2213,8 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) 
		err = snd_audigy2nx_controls_create(mixer);

		if (err < 0)

			break;

		if (!snd_card_proc_new(mixer->chip->card, "audigy2nx", &entry))

			snd_info_set_text_ops(entry, mixer,

					      snd_audigy2nx_proc_read);

		snd_card_ro_proc_new(mixer->chip->card, "audigy2nx",

				     mixer, snd_audigy2nx_proc_read);

		break;



	/* EMU0204 */

sound/usb/proc.c

+5 −8
Original line number Diff line number Diff line
@@ -61,11 +61,10 @@ static void proc_audio_usbid_read(struct snd_info_entry *entry, struct snd_info_ 


void snd_usb_audio_create_proc(struct snd_usb_audio *chip)

{

	struct snd_info_entry *entry;

	if (!snd_card_proc_new(chip->card, "usbbus", &entry))

		snd_info_set_text_ops(entry, chip, proc_audio_usbbus_read);

	if (!snd_card_proc_new(chip->card, "usbid", &entry))

		snd_info_set_text_ops(entry, chip, proc_audio_usbid_read);

	snd_card_ro_proc_new(chip->card, "usbbus", chip,

			     proc_audio_usbbus_read);

	snd_card_ro_proc_new(chip->card, "usbid", chip,

			     proc_audio_usbid_read);

}



/*
@@ -167,12 +166,10 @@ static void proc_pcm_format_read(struct snd_info_entry *entry, struct snd_info_b 


void snd_usb_proc_pcm_format_add(struct snd_usb_stream *stream)

{

	struct snd_info_entry *entry;

	char name[32];

	struct snd_card *card = stream->chip->card;



	sprintf(name, "stream%d", stream->pcm_index);

	if (!snd_card_proc_new(card, name, &entry))

		snd_info_set_text_ops(entry, stream, proc_pcm_format_read);

	snd_card_ro_proc_new(card, name, stream, proc_pcm_format_read);

}