Commit 68bf7a8c authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: wacom_w8001 - use "guard" notation when acquiring mutex 

Switch the driver to use guard notation when acquiring mutex to
have it released automatically.

Link: https://lore.kernel.org/r/Zmkyvkr9AFyywy1V@google.com


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 19a3e160

drivers/input/touchscreen/wacom_w8001.c

+10 −12
Original line number Diff line number Diff line
@@ -380,30 +380,28 @@ static int w8001_open(struct input_dev *dev) 
	struct w8001 *w8001 = input_get_drvdata(dev);

	int err;



	err = mutex_lock_interruptible(&w8001->mutex);

	scoped_guard(mutex_intr, &w8001->mutex) {

		if (w8001->open_count == 0) {

			err = w8001_command(w8001, W8001_CMD_START, false);

			if (err)

				return err;

		}



	if (w8001->open_count++ == 0) {

		err = w8001_command(w8001, W8001_CMD_START, false);

		if (err)

			w8001->open_count--;

		w8001->open_count++;

		return 0;

	}



	mutex_unlock(&w8001->mutex);

	return err;

	return -EINTR;

}



static void w8001_close(struct input_dev *dev)

{

	struct w8001 *w8001 = input_get_drvdata(dev);



	mutex_lock(&w8001->mutex);

	guard(mutex)(&w8001->mutex);



	if (--w8001->open_count == 0)

		w8001_command(w8001, W8001_CMD_STOP, false);



	mutex_unlock(&w8001->mutex);

}



static int w8001_detect(struct w8001 *w8001)