|
@@ -1527,13 +1527,11 @@ static int snd_pcm_drain(struct snd_pcm_substream *substream,
|
|
|
static int snd_pcm_drop(struct snd_pcm_substream *substream)
|
|
|
{
|
|
|
struct snd_pcm_runtime *runtime;
|
|
|
- struct snd_card *card;
|
|
|
int result = 0;
|
|
|
|
|
|
if (PCM_RUNTIME_CHECK(substream))
|
|
|
return -ENXIO;
|
|
|
runtime = substream->runtime;
|
|
|
- card = substream->pcm->card;
|
|
|
|
|
|
if (runtime->status->state == SNDRV_PCM_STATE_OPEN ||
|
|
|
runtime->status->state == SNDRV_PCM_STATE_DISCONNECTED ||
|
|
@@ -2065,7 +2063,6 @@ static int snd_pcm_open_file(struct file *file,
|
|
|
{
|
|
|
struct snd_pcm_file *pcm_file;
|
|
|
struct snd_pcm_substream *substream;
|
|
|
- struct snd_pcm_str *str;
|
|
|
int err;
|
|
|
|
|
|
if (rpcm_file)
|
|
@@ -2082,7 +2079,6 @@ static int snd_pcm_open_file(struct file *file,
|
|
|
}
|
|
|
pcm_file->substream = substream;
|
|
|
if (substream->ref_count == 1) {
|
|
|
- str = substream->pstr;
|
|
|
substream->file = pcm_file;
|
|
|
substream->pcm_release = pcm_release_private;
|
|
|
}
|
|
@@ -3024,11 +3020,9 @@ static const struct vm_operations_struct snd_pcm_vm_ops_status =
|
|
|
static int snd_pcm_mmap_status(struct snd_pcm_substream *substream, struct file *file,
|
|
|
struct vm_area_struct *area)
|
|
|
{
|
|
|
- struct snd_pcm_runtime *runtime;
|
|
|
long size;
|
|
|
if (!(area->vm_flags & VM_READ))
|
|
|
return -EINVAL;
|
|
|
- runtime = substream->runtime;
|
|
|
size = area->vm_end - area->vm_start;
|
|
|
if (size != PAGE_ALIGN(sizeof(struct snd_pcm_mmap_status)))
|
|
|
return -EINVAL;
|
|
@@ -3063,11 +3057,9 @@ static const struct vm_operations_struct snd_pcm_vm_ops_control =
|
|
|
static int snd_pcm_mmap_control(struct snd_pcm_substream *substream, struct file *file,
|
|
|
struct vm_area_struct *area)
|
|
|
{
|
|
|
- struct snd_pcm_runtime *runtime;
|
|
|
long size;
|
|
|
if (!(area->vm_flags & VM_READ))
|
|
|
return -EINVAL;
|
|
|
- runtime = substream->runtime;
|
|
|
size = area->vm_end - area->vm_start;
|
|
|
if (size != PAGE_ALIGN(sizeof(struct snd_pcm_mmap_control)))
|
|
|
return -EINVAL;
|