diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2009-11-02 09:34:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-11-06 14:32:03 +0100 |
| commit | 31cef7076ed9409a33f19ea372d6dc5fdefe27ae (patch) | |
| tree | 399f23081af72b3015cc28a3ac6bbc5d7aedb5f9 | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
control: remove snd_konctrol_volatile::owner_pid field
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>
| -rw-r--r-- | include/sound/control.h | 1 | ||||
| -rw-r--r-- | sound/core/control.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/sound/control.h b/include/sound/control.h index ef96f07aa03..3517745d0a2 100644 --- a/include/sound/control.h +++ b/include/sound/control.h @@ -56,7 +56,6 @@ struct snd_kcontrol_new { struct snd_kcontrol_volatile { struct snd_ctl_file *owner; /* locked */ - pid_t owner_pid; unsigned int access; /* access rights */ }; diff --git a/sound/core/control.c b/sound/core/control.c index a8b7fabe645..814d2cf1a34 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -672,7 +672,7 @@ static int snd_ctl_elem_info(struct snd_ctl_file *ctl, info->access |= SNDRV_CTL_ELEM_ACCESS_LOCK; if (vd->owner == ctl) info->access |= SNDRV_CTL_ELEM_ACCESS_OWNER; - info->owner = vd->owner_pid; + info->owner = vd->owner->pid; } else { info->owner = -1; } @@ -827,7 +827,6 @@ static int snd_ctl_elem_lock(struct snd_ctl_file *file, result = -EBUSY; else { vd->owner = file; - vd->owner_pid = current->pid; result = 0; } } @@ -858,7 +857,6 @@ static int snd_ctl_elem_unlock(struct snd_ctl_file *file, result = -EPERM; else { vd->owner = NULL; - vd->owner_pid = 0; result = 0; } } |