summaryrefslogtreecommitdiff
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-05-23 12:09:18 +0300
committerTakashi Iwai <tiwai@suse.de>2021-05-25 09:49:06 +0300
commit968bb2baec60757ae86b4ee937561f5815488044 (patch)
tree30f4458f4887ab9e2a008fe9c5b6a39bdd0949b0 /sound/core
parent73063cd3236e8b17e530c491b1d265ff56f1fa79 (diff)
downloadlinux-968bb2baec60757ae86b4ee937561f5815488044.tar.xz
ALSA: control: Minor optimization for SNDRV_CTL_IOCTL_POWER_STATE
Long long time ago, before the proper PM framework was introduced, it was still possible to reach SNDRV_CTL_IOCTL_POWER ioctl during the power off state. This ioctl existed as a main control for the suspend resume state in the past, but the feature was already dropped along with the standard PM framework. Now the read part, SNDRV_IOCTL_POWER_STATE ioctl, returns practically always D0, and we can do some minor optimization there. Reviewed-by: Jaroslav Kysela <perex@perex.cz> Link: https://lore.kernel.org/r/20210523090920.15345-5-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/control.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/core/control.c b/sound/core/control.c
index 7fe901384c9c..a25c0d64d104 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1817,11 +1817,7 @@ static long snd_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg
case SNDRV_CTL_IOCTL_POWER:
return -ENOPROTOOPT;
case SNDRV_CTL_IOCTL_POWER_STATE:
-#ifdef CONFIG_PM
- return put_user(card->power_state, ip) ? -EFAULT : 0;
-#else
return put_user(SNDRV_CTL_POWER_D0, ip) ? -EFAULT : 0;
-#endif
}
down_read(&snd_ioctl_rwsem);
list_for_each_entry(p, &snd_control_ioctls, list) {