Commit d5323227 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb: fcp: 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 bdcdb4e7

sound/usb/fcp.c

+7 −10
Original line number Diff line number Diff line
@@ -820,7 +820,6 @@ static long fcp_hwdep_read(struct snd_hwdep *hw, char __user *buf, 
{

	struct usb_mixer_interface *mixer = hw->private_data;

	struct fcp_data *private = mixer->private_data;

	unsigned long flags;

	long ret = 0;

	u32 event;
@@ -832,10 +831,10 @@ static long fcp_hwdep_read(struct snd_hwdep *hw, char __user *buf, 
	if (ret)

		return ret;



	spin_lock_irqsave(&private->notify.lock, flags);

	scoped_guard(spinlock_irqsave, &private->notify.lock) {

		event = private->notify.event;

		private->notify.event = 0;

	spin_unlock_irqrestore(&private->notify.lock, flags);

	}



	if (copy_to_user(buf, &event, sizeof(event)))

		return -EFAULT;
@@ -946,11 +945,9 @@ static void fcp_notify(struct urb *urb) 
	}



	if (data) {

		unsigned long flags;



		spin_lock_irqsave(&private->notify.lock, flags);

		scoped_guard(spinlock_irqsave, &private->notify.lock) {

			private->notify.event |= data;

		spin_unlock_irqrestore(&private->notify.lock, flags);

		}



		wake_up_interruptible(&private->notify.queue);

	}