Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7eb1f7a0 authored by Tim Sell's avatar Tim Sell Committed by Greg Kroah-Hartman
Browse files

staging: unisys: visorinput: no need to track open count 



evdev_open_device() and evdev_close_device() (in evdev.c) already track
the open count under lock, and will only call visorinput_open() on the
first open and visorinput_close() on the last close.  So this patch
removes the unnessary logic from visorinput, and the now-unused counter
from the struct.

Signed-off-by: default avatarTim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b756c43

drivers/staging/unisys/visorinput/visorinput.c

+4 −14
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ struct visorinput_devdata { 
	struct rw_semaphore lock_visor_dev; /* lock for dev */

	struct input_dev *visorinput_dev;

	bool paused;

	unsigned int opened;

	unsigned int keycode_table_bytes; /* size of following array */

	/* for keyboard devices: visorkbd_keycode[] + visorkbd_ext_keycode[] */

	unsigned char keycode_table[0];
@@ -227,10 +226,7 @@ static int visorinput_open(struct input_dev *visorinput_dev) 
		       __func__, visorinput_dev);

		return -EINVAL;

	}

	devdata->opened++;

	dev_dbg(&visorinput_dev->dev, "%s opened %d\n", __func__,

		devdata->opened);

	if (devdata->opened == 1)

	dev_dbg(&visorinput_dev->dev, "%s opened\n", __func__);

	visorbus_enable_channel_interrupts(devdata->dev);

	return 0;

}
@@ -244,14 +240,8 @@ static void visorinput_close(struct input_dev *visorinput_dev) 
		       __func__, visorinput_dev);

		return;

	}

	if (devdata->opened) {

		devdata->opened--;

		dev_dbg(&visorinput_dev->dev, "%s closed %d\n", __func__,

			devdata->opened);

		if (devdata->opened == 0)

	dev_dbg(&visorinput_dev->dev, "%s closed\n", __func__);

	visorbus_disable_channel_interrupts(devdata->dev);

	} else

		dev_err(&visorinput_dev->dev, "%s not open\n", __func__);

}



/*