Re: [PATCH] sound core: remove unused variables.

[Takashi Iwai]

At Wed, 25 May 2011 22:43:27 +0200,
Luca Tettamanti wrote:
> 
> Drop a few variables that are never read.
> 
> Signed-off-by: Luca Tettamanti <kronos.it@xxxxxxxxx>

Applied now.  Thanks.


Takashi

> ---
>  sound/core/control.c       |    3 +--
>  sound/core/init.c          |    3 ---
>  sound/core/oss/linear.c    |    3 ---
>  sound/core/pcm_native.c    |    8 --------
>  sound/core/seq/seq_queue.c |    2 --
>  5 files changed, 1 insertions(+), 18 deletions(-)
> 
> diff --git a/sound/core/control.c b/sound/core/control.c
> index 5d98194..f8c5be4 100644
> --- a/sound/core/control.c
> +++ b/sound/core/control.c
> @@ -704,13 +704,12 @@ static int snd_ctl_elem_list(struct snd_card *card,
>  	struct snd_ctl_elem_list list;
>  	struct snd_kcontrol *kctl;
>  	struct snd_ctl_elem_id *dst, *id;
> -	unsigned int offset, space, first, jidx;
> +	unsigned int offset, space, jidx;
>  	
>  	if (copy_from_user(&list, _list, sizeof(list)))
>  		return -EFAULT;
>  	offset = list.offset;
>  	space = list.space;
> -	first = 0;
>  	/* try limit maximum space */
>  	if (space > 16384)
>  		return -ENOMEM;
> diff --git a/sound/core/init.c b/sound/core/init.c
> index 30ecad4..2c041bb 100644
> --- a/sound/core/init.c
> +++ b/sound/core/init.c
> @@ -342,7 +342,6 @@ static const struct file_operations snd_shutdown_f_ops =
>  int snd_card_disconnect(struct snd_card *card)
>  {
>  	struct snd_monitor_file *mfile;
> -	struct file *file;
>  	int err;
>  
>  	if (!card)
> @@ -366,8 +365,6 @@ int snd_card_disconnect(struct snd_card *card)
>  	
>  	spin_lock(&card->files_lock);
>  	list_for_each_entry(mfile, &card->files_list, list) {
> -		file = mfile->file;
> -
>  		/* it's critical part, use endless loop */
>  		/* we have no room to fail */
>  		mfile->disconnected_f_op = mfile->file->f_op;
> diff --git a/sound/core/oss/linear.c b/sound/core/oss/linear.c
> index 13b3f6f..2045697 100644
> --- a/sound/core/oss/linear.c
> +++ b/sound/core/oss/linear.c
> @@ -90,11 +90,8 @@ static snd_pcm_sframes_t linear_transfer(struct snd_pcm_plugin *plugin,
>  			       struct snd_pcm_plugin_channel *dst_channels,
>  			       snd_pcm_uframes_t frames)
>  {
> -	struct linear_priv *data;
> -
>  	if (snd_BUG_ON(!plugin || !src_channels || !dst_channels))
>  		return -ENXIO;
> -	data = (struct linear_priv *)plugin->extra_data;
>  	if (frames == 0)
>  		return 0;
>  #ifdef CONFIG_SND_DEBUG
> diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
> index 1a07750..3a5f86d 100644
> --- a/sound/core/pcm_native.c
> +++ b/sound/core/pcm_native.c
> @@ -1518,13 +1518,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 ||
> @@ -2056,7 +2054,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)
> @@ -2073,7 +2070,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;
>  	}
> @@ -3015,11 +3011,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;
> @@ -3054,11 +3048,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;
> diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c
> index e7a8e9e..f907736 100644
> --- a/sound/core/seq/seq_queue.c
> +++ b/sound/core/seq/seq_queue.c
> @@ -467,13 +467,11 @@ int snd_seq_queue_timer_open(int queueid)
>  int snd_seq_queue_timer_close(int queueid)
>  {
>  	struct snd_seq_queue *queue;
> -	struct snd_seq_timer *tmr;
>  	int result = 0;
>  
>  	queue = queueptr(queueid);
>  	if (queue == NULL)
>  		return -EINVAL;
> -	tmr = queue->timer;
>  	snd_seq_timer_close(queue);
>  	queuefree(queue);
>  	return result;
> -- 
> 1.7.5.1
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/