summaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet/wacom.h
diff options
context:
space:
mode:
authorDmitry Torokhov2010-03-20 06:18:15 +0100
committerDmitry Torokhov2010-04-14 08:24:11 +0200
commit51269fe86c263ec4fafbafe82970e6d7f6f79102 (patch)
tree95b0b767cbceef5a6bc8918e4e22b3962ec7a23e /drivers/input/tablet/wacom.h
parentInput: wacom - share pen info with touch of the same ID (diff)
downloadkernel-qcow2-linux-51269fe86c263ec4fafbafe82970e6d7f6f79102.tar.gz
kernel-qcow2-linux-51269fe86c263ec4fafbafe82970e6d7f6f79102.tar.xz
kernel-qcow2-linux-51269fe86c263ec4fafbafe82970e6d7f6f79102.zip
Input: wacom - do not allocate wacom_wac separately
There is no reason for allocating struct wacom_wac separately from struct wacom since both have the same lifetime rules and are not shared. Also make 'open' field a boolean. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/tablet/wacom.h')
-rw-r--r--drivers/input/tablet/wacom.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h
index 8fef1b689c69..fdb1d16b9471 100644
--- a/drivers/input/tablet/wacom.h
+++ b/drivers/input/tablet/wacom.h
@@ -110,9 +110,9 @@ struct wacom {
struct usb_device *usbdev;
struct usb_interface *intf;
struct urb *irq;
- struct wacom_wac *wacom_wac;
+ struct wacom_wac wacom_wac;
struct mutex lock;
- unsigned int open:1;
+ bool open;
char phys[32];
};