Commit 4c680628 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: sparc/amd7930: Use guard() for spin locks 



Clean up the code using guard() for spin locks.

Merely code refactoring, and no behavior change.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 02d0aba6

sound/sparc/amd7930.c

+45 −69
Original line number Diff line number Diff line
@@ -346,34 +346,25 @@ static struct snd_amd7930 *amd7930_list; 
/* Idle the AMD7930 chip.  The amd->lock is not held.  */

static __inline__ void amd7930_idle(struct snd_amd7930 *amd)

{

	unsigned long flags;



	spin_lock_irqsave(&amd->lock, flags);

	guard(spinlock_irqsave)(&amd->lock);

	sbus_writeb(AMR_INIT, amd->regs + AMD7930_CR);

	sbus_writeb(0, amd->regs + AMD7930_DR);

	spin_unlock_irqrestore(&amd->lock, flags);

}



/* Enable chip interrupts.  The amd->lock is not held.  */

static __inline__ void amd7930_enable_ints(struct snd_amd7930 *amd)

{

	unsigned long flags;



	spin_lock_irqsave(&amd->lock, flags);

	guard(spinlock_irqsave)(&amd->lock);

	sbus_writeb(AMR_INIT, amd->regs + AMD7930_CR);

	sbus_writeb(AM_INIT_ACTIVE, amd->regs + AMD7930_DR);

	spin_unlock_irqrestore(&amd->lock, flags);

}



/* Disable chip interrupts.  The amd->lock is not held.  */

static __inline__ void amd7930_disable_ints(struct snd_amd7930 *amd)

{

	unsigned long flags;



	spin_lock_irqsave(&amd->lock, flags);

	guard(spinlock_irqsave)(&amd->lock);

	sbus_writeb(AMR_INIT, amd->regs + AMD7930_CR);

	sbus_writeb(AM_INIT_ACTIVE | AM_INIT_DISABLE_INTS, amd->regs + AMD7930_DR);

	spin_unlock_irqrestore(&amd->lock, flags);

}



/* Commit amd7930_map settings to the hardware.
@@ -497,8 +488,7 @@ static irqreturn_t snd_amd7930_interrupt(int irq, void *dev_id) 
	unsigned int elapsed;

	u8 ir;



	spin_lock(&amd->lock);



	scoped_guard(spinlock, &amd->lock) {

		elapsed = 0;



		ir = sbus_readb(amd->regs + AMD7930_IR);
@@ -524,7 +514,7 @@ static irqreturn_t snd_amd7930_interrupt(int irq, void *dev_id) 
				}

			}

		}

	spin_unlock(&amd->lock);

	}



	if (elapsed & AMD7930_FLAG_PLAYBACK)

		snd_pcm_period_elapsed(amd->playback_substream);
@@ -536,10 +526,9 @@ static irqreturn_t snd_amd7930_interrupt(int irq, void *dev_id) 


static int snd_amd7930_trigger(struct snd_amd7930 *amd, unsigned int flag, int cmd)

{

	unsigned long flags;

	int result = 0;



	spin_lock_irqsave(&amd->lock, flags);

	guard(spinlock_irqsave)(&amd->lock);

	if (cmd == SNDRV_PCM_TRIGGER_START) {

		if (!(amd->flags & flag)) {

			amd->flags |= flag;
@@ -559,7 +548,6 @@ static int snd_amd7930_trigger(struct snd_amd7930 *amd, unsigned int flag, int c 
	} else {

		result = -EINVAL;

	}

	spin_unlock_irqrestore(&amd->lock, flags);



	return result;

}
@@ -583,10 +571,9 @@ static int snd_amd7930_playback_prepare(struct snd_pcm_substream *substream) 
	struct snd_amd7930 *amd = snd_pcm_substream_chip(substream);

	struct snd_pcm_runtime *runtime = substream->runtime;

	unsigned int size = snd_pcm_lib_buffer_bytes(substream);

	unsigned long flags;

	u8 new_mmr1;



	spin_lock_irqsave(&amd->lock, flags);

	guard(spinlock_irqsave)(&amd->lock);



	amd->flags |= AMD7930_FLAG_PLAYBACK;
@@ -605,8 +592,6 @@ static int snd_amd7930_playback_prepare(struct snd_pcm_substream *substream) 
		__amd7930_update_map(amd);

	}



	spin_unlock_irqrestore(&amd->lock, flags);



	return 0;

}
@@ -615,10 +600,9 @@ static int snd_amd7930_capture_prepare(struct snd_pcm_substream *substream) 
	struct snd_amd7930 *amd = snd_pcm_substream_chip(substream);

	struct snd_pcm_runtime *runtime = substream->runtime;

	unsigned int size = snd_pcm_lib_buffer_bytes(substream);

	unsigned long flags;

	u8 new_mmr1;



	spin_lock_irqsave(&amd->lock, flags);

	guard(spinlock_irqsave)(&amd->lock);



	amd->flags |= AMD7930_FLAG_CAPTURE;
@@ -637,8 +621,6 @@ static int snd_amd7930_capture_prepare(struct snd_pcm_substream *substream) 
		__amd7930_update_map(amd);

	}



	spin_unlock_irqrestore(&amd->lock, flags);



	return 0;

}
@@ -805,7 +787,6 @@ static int snd_amd7930_get_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem 
static int snd_amd7930_put_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *ucontrol)

{

	struct snd_amd7930 *amd = snd_kcontrol_chip(kctl);

	unsigned long flags;

	int type = kctl->private_value;

	int *swval, change;
@@ -822,7 +803,7 @@ static int snd_amd7930_put_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem 
		break;

	}



	spin_lock_irqsave(&amd->lock, flags);

	guard(spinlock_irqsave)(&amd->lock);



	if (*swval != ucontrol->value.integer.value[0]) {

		*swval = ucontrol->value.integer.value[0] & 0xff;
@@ -831,8 +812,6 @@ static int snd_amd7930_put_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem 
	} else

		change = 0;



	spin_unlock_irqrestore(&amd->lock, flags);



	return change;

}
@@ -921,7 +900,6 @@ static int snd_amd7930_create(struct snd_card *card, 
			      struct snd_amd7930 **ramd)

{

	struct snd_amd7930 *amd;

	unsigned long flags;

	int err;



	*ramd = NULL;
@@ -955,8 +933,7 @@ static int snd_amd7930_create(struct snd_card *card, 


	amd7930_enable_ints(amd);



	spin_lock_irqsave(&amd->lock, flags);



	scoped_guard(spinlock_irqsave, &amd->lock) {

		amd->rgain = 128;

		amd->pgain = 200;

		amd->mgain = 0;
@@ -972,8 +949,7 @@ static int snd_amd7930_create(struct snd_card *card, 
		sbus_writeb(AMR_MUX_MCR1, amd->regs + AMD7930_CR);

		sbus_writeb(AM_MUX_CHANNEL_Ba | (AM_MUX_CHANNEL_Bb << 4),

			    amd->regs + AMD7930_DR);



	spin_unlock_irqrestore(&amd->lock, flags);

	}



	err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,

			     amd, &snd_amd7930_dev_ops);