Commit 73063cd3 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: control: Drop superfluous snd_power_wait() calls 



Now we have more fine-grained power controls in each kcontrol ops, the
coarse checks of snd_power_wait() in a few control ioctls became
superfluous.  Let's drop them.

Reviewed-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20210523090920.15345-4-tiwai@suse.de


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

sound/core/control.c

+0 −11
Original line number Diff line number Diff line
@@ -1045,9 +1045,6 @@ static int snd_ctl_elem_info_user(struct snd_ctl_file *ctl, 


	if (copy_from_user(&info, _info, sizeof(info)))

		return -EFAULT;

	result = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0);

	if (result < 0)

		return result;

	result = snd_ctl_elem_info(ctl, &info);

	if (result < 0)

		return result;
@@ -1119,10 +1116,6 @@ static int snd_ctl_elem_read_user(struct snd_card *card, 
	if (IS_ERR(control))

		return PTR_ERR(control);



	result = snd_power_wait(card, SNDRV_CTL_POWER_D0);

	if (result < 0)

		goto error;



	down_read(&card->controls_rwsem);

	result = snd_ctl_elem_read(card, control);

	up_read(&card->controls_rwsem);
@@ -1192,10 +1185,6 @@ static int snd_ctl_elem_write_user(struct snd_ctl_file *file, 
		return PTR_ERR(control);



	card = file->card;

	result = snd_power_wait(card, SNDRV_CTL_POWER_D0);

	if (result < 0)

		goto error;



	result = snd_ctl_elem_write(card, file, control);

	if (result < 0)

		goto error;

sound/core/control_compat.c

+0 −9
Original line number Diff line number Diff line
@@ -96,9 +96,6 @@ static int snd_ctl_elem_info_compat(struct snd_ctl_file *ctl, 
	if (get_user(data->value.enumerated.item, &data32->value.enumerated.item))

		goto error;



	err = snd_power_wait(ctl->card, SNDRV_CTL_POWER_D0);

	if (err < 0)

		goto error;

	err = snd_ctl_elem_info(ctl, data);

	if (err < 0)

		goto error;
@@ -301,9 +298,6 @@ static int ctl_elem_read_user(struct snd_card *card, 
	if (err < 0)

		goto error;



	err = snd_power_wait(card, SNDRV_CTL_POWER_D0);

	if (err < 0)

		goto error;

	err = snd_ctl_elem_read(card, data);

	if (err < 0)

		goto error;
@@ -329,9 +323,6 @@ static int ctl_elem_write_user(struct snd_ctl_file *file, 
	if (err < 0)

		goto error;



	err = snd_power_wait(card, SNDRV_CTL_POWER_D0);

	if (err < 0)

		goto error;

	err = snd_ctl_elem_write(card, file, data);

	if (err < 0)

		goto error;