From 9d2f1d3cdedd4d3efff8d14f1f49cf73e2f5cc36 Mon Sep 17 00:00:00 2001 From: David Härdeman Date: Thu, 3 Apr 2014 20:32:26 -0300 Subject: [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 Signed-off-by: Mauro Carvalho Chehab --- include/media/rc-core.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/media') 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; -- cgit v1.2.3-55-g7522