diff options
author | David Härdeman <david@hardeman.nu> | 2010-10-29 15:08:07 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-12-29 05:16:35 -0500 |
commit | 62c6503125389763a74911408d984c5dd09eeb97 (patch) | |
tree | a9b419280d25fca5086d82f8992a1d5843da75f1 /drivers/media/video/cx88/cx88-input.c | |
parent | 2997137be8eba5bf9c07a24d5fda1f4225f9ca7d (diff) |
[media] ir-core: remove remaining users of the ir-functions keyhandlers
This patch removes the remaining usages of the ir_input_nokey() and
ir_input_keydown() functions provided by drivers/media/IR/ir-functions.c
by using the corresponding functionality in ir-core instead.
Signed-off-by: David Härdeman <david@hardeman.nu>
Acked-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88/cx88-input.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index 436ace8196a5..564e3cb29c4d 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -131,16 +131,21 @@ static void cx88_ir_handle_key(struct cx88_IR *ir) | |||
131 | } else if (ir->mask_keydown) { | 131 | } else if (ir->mask_keydown) { |
132 | /* bit set on keydown */ | 132 | /* bit set on keydown */ |
133 | if (gpio & ir->mask_keydown) | 133 | if (gpio & ir->mask_keydown) |
134 | ir_keydown(ir->input, data, 0); | 134 | ir_keydown_notimeout(ir->input, data, 0); |
135 | else | ||
136 | ir_keyup(ir->input); | ||
135 | 137 | ||
136 | } else if (ir->mask_keyup) { | 138 | } else if (ir->mask_keyup) { |
137 | /* bit cleared on keydown */ | 139 | /* bit cleared on keydown */ |
138 | if (0 == (gpio & ir->mask_keyup)) | 140 | if (0 == (gpio & ir->mask_keyup)) |
139 | ir_keydown(ir->input, data, 0); | 141 | ir_keydown_notimeout(ir->input, data, 0); |
142 | else | ||
143 | ir_keyup(ir->input); | ||
140 | 144 | ||
141 | } else { | 145 | } else { |
142 | /* can't distinguish keydown/up :-/ */ | 146 | /* can't distinguish keydown/up :-/ */ |
143 | ir_keydown(ir->input, data, 0); | 147 | ir_keydown_notimeout(ir->input, data, 0); |
148 | ir_keyup(ir->input); | ||
144 | } | 149 | } |
145 | } | 150 | } |
146 | 151 | ||