Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Cc: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Subject: [PATCH 4/7] ALSA: control: Minor optimization for SNDRV_CTL_IOCTL_POWER_STATE
Date: Tue, 18 May 2021 18:51:58 +0200	[thread overview]
Message-ID: <20210518165201.24376-5-tiwai@suse.de> (raw)
In-Reply-To: <20210518165201.24376-1-tiwai@suse.de>

The SNDRV_CTL_IOCTL_POWER_STATE is an obsoleted ioctl and now
practically it returns always D0.  Do some minor optimization.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/core/control.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/sound/core/control.c b/sound/core/control.c
index 799d91ddccb0..5e8b77855e5d 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1807,11 +1807,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) {
-- 
2.26.2


  parent reply	other threads:[~2021-05-18 16:55 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-18 16:51 [PATCH 0/7] ALSA: Prep work for PCI rescan support Takashi Iwai
2021-05-18 16:51 ` [PATCH 1/7] ALSA: core: Use READ_ONCE() / WRITE_ONCE() for power state change Takashi Iwai
2021-05-18 16:51 ` [PATCH 2/7] ALSA: control: Add power state check commonly for ioctl handlers Takashi Iwai
2021-05-18 18:00   ` Jaroslav Kysela
2021-05-18 19:31     ` Takashi Iwai
2021-05-18 16:51 ` [PATCH 3/7] ALSA: control: Drop superfluous snd_power_wait() calls Takashi Iwai
2021-05-18 16:51 ` Takashi Iwai [this message]
2021-05-18 16:51 ` [PATCH 5/7] ALSA: control: Track in-flight control read/write/tlv accesses Takashi Iwai
2021-05-18 18:01   ` Jaroslav Kysela
2021-05-18 18:54     ` Takashi Iwai
2021-05-18 16:52 ` [PATCH 6/7] ALSA: pcm: Block the release until the system resume finishes Takashi Iwai
2021-05-18 16:52 ` [PATCH 7/7] ALSA: Drop superfluous argument from snd_power_wait() Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210518165201.24376-5-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=andrey.grodzovsky@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox