sst: remove the kernel locking in ioctl
PATCH 1/2 sst: remove the kernel locking in ioctl
From: Vinod Koul <[email protected]>
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 <[email protected]>
Signed-off-by Alan Cox <[email protected]>
---
.../staging/intel_sst/intel_sst_app_interface.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-)
drivers/staging/intel_sst/intel_sst_app_interface.c +1 -6
@@ -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; }
PATCH 2/2 sst: Remove the aava bits
From: Alan Cox <[email protected]>
We don't need these special cases any more.
Signed-off-by Alan Cox <[email protected]>
---
drivers/staging/intel_sst/TODO | 5 drivers/staging/intel_sst/intelmid.c | 17 - drivers/staging/intel_sst/intelmid_v1_control.c | 454 +++++++---------------- 3 files changed, 146 insertions(+), 330 deletions(-)
drivers/staging/intel_sst/TODO +3 -2
@@ -2,11 +2,12 @@ TODO ---- Get the memrar driver cleaned up and upstream (dependancy blocking SST) -Get the jack header entries accepted +Replace long/short press with two virtual buttons Review the printks and kill off any left over ST_ERR: messages Review the misc device ioctls for 32/64bit safety and sanity Review the misc device ioctls for size safety depending on config and decide if space/unused areas should be left +What the sound folks turn up on full review +Using the ALSA frameworks properly -Anything the sound folks turn up on full review
drivers/staging/intel_sst/intelmid.c +2 -15
@@ -639,7 +639,7 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata) jack = &intelmaddata->jack[3 ].jack; present =1 ; jack_event_flag =1 ; - }else { + }else {pr_debug ("sst: short press detected\n" );/* send headphone detect/undetect */ jack = &intelmaddata->jack[2 ].jack;
@@ -649,21 +649,8 @@ void sst_mad_jackdetection_mx(u8 intsts, struct snd_intelmad *intelmaddata) } } - intelmaddata->jack_prev_state = value ; - - } -if (is_aava () && jack) { -if (present) { -pr_debug ("sst: Jack... YES\n" ); - scard_ops->set_output_dev (STEREO_HEADPHONE ); - - }else { -pr_debug ("sst: Jack... NO\n" ); - scard_ops->set_output_dev (INTERNAL_SPKR ); - - } + intelmaddata->jack_prev_state = value; } -if (jack_event_flag)sst_mad_send_jack_report (jack, buttonpressflag, present); }
drivers/staging/intel_sst/intelmid_v1_control.c +141 -313
494 lines not on this page · raw message