diff options
| author | David Härdeman <david@hardeman.nu> | 2014-04-04 01:32:26 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-26 00:10:43 +0200 |
| commit | 9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36 (patch) | |
| tree | 7219355d62954d139ae84d5b781be3e51287dd37 /include/media | |
| parent | [media] rc-core: remove protocol arrays (diff) | |
| download | linux-9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36.tar.xz linux-9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36.zip | |
[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 { * @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; |