Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

control: remove snd_konctrol_volatile::owner_pid field

Browse Source 
We do not need to save the ID of the process that locked a control
because that information is already available in the owner's file data.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Clemens Ladisch 2009-11-02 09:34:16 +01:00 committed by Takashi Iwai
parent b419148e56
commit 31cef7076e
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/control.h
View File

@ -56,7 +56,6 @@ struct snd_kcontrol_new {
struct snd_kcontrol_volatile { struct snd_kcontrol_volatile {
struct snd_ctl_file *owner; /* locked */ struct snd_ctl_file *owner; /* locked */
pid_t owner_pid;
unsigned int access; /* access rights */ unsigned int access; /* access rights */
}; };

4
sound/core/control.c
View File

@ -672,7 +672,7 @@ static int snd_ctl_elem_info(struct snd_ctl_file *ctl,
info->access |= SNDRV_CTL_ELEM_ACCESS_LOCK; info->access |= SNDRV_CTL_ELEM_ACCESS_LOCK;
if (vd->owner == ctl) if (vd->owner == ctl)
info->access |= SNDRV_CTL_ELEM_ACCESS_OWNER; info->access |= SNDRV_CTL_ELEM_ACCESS_OWNER;
info->owner = vd->owner_pid; info->owner = vd->owner->pid;
} else { } else {
info->owner = -1; info->owner = -1;
} }
@ -827,7 +827,6 @@ static int snd_ctl_elem_lock(struct snd_ctl_file *file,
result = -EBUSY; result = -EBUSY;
else { else {
vd->owner = file; vd->owner = file;
vd->owner_pid = current->pid;
result = 0; result = 0;
} }
} }
@ -858,7 +857,6 @@ static int snd_ctl_elem_unlock(struct snd_ctl_file *file,
result = -EPERM; result = -EPERM;
else { else {
vd->owner = NULL; vd->owner = NULL;
vd->owner_pid = 0;
result = 0; result = 0;
} }
} }