From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: alsa-devel@alsa-project.org, greg@kroah.com
Subject: [PATCH 1/2] sst: remove the kernel locking in ioctl
Date: Thu, 14 Oct 2010 16:59:38 +0100 [thread overview]
Message-ID: <20101014155933.27495.51005.stgit@localhost.localdomain> (raw)
From: Vinod Koul <vinod.koul@intel.com>
kernel locking in ioctl was introduced when ioctl function was
moved from ioctl to unlocked ioctl
This is no longer required hence removed
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
.../staging/intel_sst/intel_sst_app_interface.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/intel_sst/intel_sst_app_interface.c b/drivers/staging/intel_sst/intel_sst_app_interface.c
index baf0ddc..82768fa 100644
--- a/drivers/staging/intel_sst/intel_sst_app_interface.c
+++ b/drivers/staging/intel_sst/intel_sst_app_interface.c
@@ -812,8 +812,6 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
struct ioctl_pvt_data *data = NULL;
int str_id = 0, minor = 0;
- lock_kernel();
-
data = file_ptr->private_data;
if (data) {
minor = 0;
@@ -821,10 +819,8 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
} else
minor = 1;
- if (sst_drv_ctx->sst_state != SST_FW_RUNNING) {
- unlock_kernel();
+ if (sst_drv_ctx->sst_state != SST_FW_RUNNING)
return -EBUSY;
- }
switch (_IOC_NR(cmd)) {
case _IOC_NR(SNDRV_SST_STREAM_PAUSE):
@@ -1227,7 +1223,6 @@ long intel_sst_ioctl(struct file *file_ptr, unsigned int cmd, unsigned long arg)
default:
retval = -EINVAL;
}
- unlock_kernel();
pr_debug("sst: intel_sst_ioctl:complete ret code = %d\n", retval);
return retval;
}
next reply other threads:[~2010-10-14 16:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-14 15:59 Alan Cox [this message]
2010-10-14 15:59 ` [PATCH 2/2] sst: Remove the aava bits Alan Cox
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=20101014155933.27495.51005.stgit@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=alsa-devel@alsa-project.org \
--cc=greg@kroah.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