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: Jaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20210523090920.15345-4-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/core/control.c b/sound/core/control.c
index 638da34605ba77f105b6c9274c4964dc82835a22..7fe901384c9cd5be4ceba23d4d6f1fd36d37d4be 100644 (file)
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -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;

diff --git a/sound/core/control_compat.c b/sound/core/control_compat.c
index 19133ee076c5bb090d9fec63c83bb6b18285360e..470dabc60aa0e23e9daea43314dc637283903fa5 100644 (file)
--- a/sound/core/control_compat.c
+++ b/sound/core/control_compat.c
@@ -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;