summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorDavid Härdeman <david@hardeman.nu>2014-04-03 20:32:26 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-25 19:10:43 -0300
commit9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36 (patch)
tree7219355d62954d139ae84d5b781be3e51287dd37 /include/media
parentc5540fbb9de39ceec108a889133664a887c2f55a (diff)
downloadop-kernel-dev-9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36.zip
op-kernel-dev-9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36.tar.gz
[media] rc-core: rename dev->scanmask to dev->scancode_mask
We already have dev->scancode_filter and dev->scancode_wakeup_filter so rename dev->scanmask to dev->scancode_mask for consistency. Signed-off-by: David Härdeman <david@hardeman.nu> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/rc-core.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 4f9e187..3047837 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -80,11 +80,12 @@ enum rc_filter_type {
* @enabled_wakeup_protocols: bitmask with the enabled RC_BIT_* wakeup protocols
* @scancode_filter: scancode filter
* @scancode_wakeup_filter: scancode wakeup filters
- * @scanmask: some hardware decoders are not capable of providing the full
+ * @scancode_mask: some hardware decoders are not capable of providing the full
* scancode to the application. As this is a hardware limit, we can't do
* anything with it. Yet, as the same keycode table can be used with other
* devices, a mask is provided to allow its usage. Drivers should generally
* leave this field in blank
+ * @users: number of current users of the device
* @priv: driver-specific data
* @keylock: protects the remaining members of the struct
* @keypressed: whether a key is currently pressed
@@ -139,8 +140,8 @@ struct rc_dev {
u64 enabled_wakeup_protocols;
struct rc_scancode_filter scancode_filter;
struct rc_scancode_filter scancode_wakeup_filter;
+ u32 scancode_mask;
u32 users;
- u32 scanmask;
void *priv;
spinlock_t keylock;
bool keypressed;
OpenPOWER on IntegriCloud