diff options
author | David Härdeman <david@hardeman.nu> | 2014-04-03 19:32:26 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-25 18:10:43 -0400 |
commit | 9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36 (patch) | |
tree | 7219355d62954d139ae84d5b781be3e51287dd37 /include/media | |
parent | c5540fbb9de39ceec108a889133664a887c2f55a (diff) |
[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.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/media/rc-core.h b/include/media/rc-core.h index 4f9e187d05bf..3047837db1cc 100644 --- a/include/media/rc-core.h +++ b/include/media/rc-core.h | |||
@@ -80,11 +80,12 @@ enum rc_filter_type { | |||
80 | * @enabled_wakeup_protocols: bitmask with the enabled RC_BIT_* wakeup protocols | 80 | * @enabled_wakeup_protocols: bitmask with the enabled RC_BIT_* wakeup protocols |
81 | * @scancode_filter: scancode filter | 81 | * @scancode_filter: scancode filter |
82 | * @scancode_wakeup_filter: scancode wakeup filters | 82 | * @scancode_wakeup_filter: scancode wakeup filters |
83 | * @scanmask: some hardware decoders are not capable of providing the full | 83 | * @scancode_mask: some hardware decoders are not capable of providing the full |
84 | * scancode to the application. As this is a hardware limit, we can't do | 84 | * scancode to the application. As this is a hardware limit, we can't do |
85 | * anything with it. Yet, as the same keycode table can be used with other | 85 | * anything with it. Yet, as the same keycode table can be used with other |
86 | * devices, a mask is provided to allow its usage. Drivers should generally | 86 | * devices, a mask is provided to allow its usage. Drivers should generally |
87 | * leave this field in blank | 87 | * leave this field in blank |
88 | * @users: number of current users of the device | ||
88 | * @priv: driver-specific data | 89 | * @priv: driver-specific data |
89 | * @keylock: protects the remaining members of the struct | 90 | * @keylock: protects the remaining members of the struct |
90 | * @keypressed: whether a key is currently pressed | 91 | * @keypressed: whether a key is currently pressed |
@@ -139,8 +140,8 @@ struct rc_dev { | |||
139 | u64 enabled_wakeup_protocols; | 140 | u64 enabled_wakeup_protocols; |
140 | struct rc_scancode_filter scancode_filter; | 141 | struct rc_scancode_filter scancode_filter; |
141 | struct rc_scancode_filter scancode_wakeup_filter; | 142 | struct rc_scancode_filter scancode_wakeup_filter; |
143 | u32 scancode_mask; | ||
142 | u32 users; | 144 | u32 users; |
143 | u32 scanmask; | ||
144 | void *priv; | 145 | void *priv; |
145 | spinlock_t keylock; | 146 | spinlock_t keylock; |
146 | bool keypressed; | 147 | bool keypressed; |