summaryrefslogtreecommitdiffstats
path: root/drivers/media/IR/ir-raw-event.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-04-04 10:44:51 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 12:56:57 -0300
commit587835a4b0ada7d78c4f3300e3ab26b7b2495705 (patch)
treead22f6a0e603f19450227b0cb260b5bb5960dfd5 /drivers/media/IR/ir-raw-event.c
parent26d5683d36729f11f5764909ae37c69488596d36 (diff)
V4L-DVB: ir-core: remove the ancillary buffer
Now that the decoders are state machine, there's no need to create an ancillary buffer while decoding the protocol. Just call the decoders code directly, event by event. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/IR/ir-raw-event.c')
-rw-r--r--drivers/media/IR/ir-raw-event.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/IR/ir-raw-event.c
index 617e437e2beb..57990a337922 100644
--- a/drivers/media/IR/ir-raw-event.c
+++ b/drivers/media/IR/ir-raw-event.c
@@ -138,37 +138,33 @@ int ir_raw_event_handle(struct input_dev *input_dev)
{
struct ir_input_dev *ir = input_get_drvdata(input_dev);
int rc;
- struct ir_raw_event *evs;
+ struct ir_raw_event ev;
int len, i;
/*
* Store the events into a temporary buffer. This allows calling more than
* one decoder to deal with the received data
*/
- len = kfifo_len(&ir->raw->kfifo) / sizeof(*evs);
+ len = kfifo_len(&ir->raw->kfifo) / sizeof(ev);
if (!len)
return 0;
- evs = kmalloc(len * sizeof(*evs), GFP_ATOMIC);
for (i = 0; i < len; i++) {
- rc = kfifo_out(&ir->raw->kfifo, &evs[i], sizeof(*evs));
- if (rc != sizeof(*evs)) {
+ rc = kfifo_out(&ir->raw->kfifo, &ev, sizeof(ev));
+ if (rc != sizeof(ev)) {
IR_dprintk(1, "overflow error: received %d instead of %zd\n",
- rc, sizeof(*evs));
+ rc, sizeof(ev));
return -EINVAL;
}
IR_dprintk(2, "event type %d, time before event: %07luus\n",
- evs[i].type, (evs[i].delta.tv_nsec + 500) / 1000);
+ ev.type, (ev.delta.tv_nsec + 500) / 1000);
+ rc = RUN_DECODER(decode, input_dev, &ev);
}
/*
* Call all ir decoders. This allows decoding the same event with
- * more than one protocol handler. It returns the number of keystrokes
- * sent to the event interface
+ * more than one protocol handler.
*/
- rc = RUN_DECODER(decode, input_dev, evs, len);
-
- kfree(evs);
return rc;
}