diff options
| author | Tim Sell <Timothy.Sell@unisys.com> | 2015-10-14 09:45:10 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-16 22:59:36 -0700 |
| commit | 7eb1f7a09bcc1c5f10241d85bee65e786558f171 (patch) | |
| tree | 406ac4e382f77f651c8951b406b06cf13aa82863 /drivers/staging/unisys | |
| parent | 1b756c43ce3b1696282670bd1de41d36e5205781 (diff) | |
| download | lwn-7eb1f7a09bcc1c5f10241d85bee65e786558f171.tar.gz lwn-7eb1f7a09bcc1c5f10241d85bee65e786558f171.zip | |
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: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys')
| -rw-r--r-- | drivers/staging/unisys/visorinput/visorinput.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c index 9fdaa9c8a269..d23c12946b0b 100644 --- a/drivers/staging/unisys/visorinput/visorinput.c +++ b/drivers/staging/unisys/visorinput/visorinput.c @@ -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,11 +226,8 @@ 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) - visorbus_enable_channel_interrupts(devdata->dev); + 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) - visorbus_disable_channel_interrupts(devdata->dev); - } else - dev_err(&visorinput_dev->dev, "%s not open\n", __func__); + dev_dbg(&visorinput_dev->dev, "%s closed\n", __func__); + visorbus_disable_channel_interrupts(devdata->dev); } /* |