projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB: ir-core: partially convert ir-kbd-i2c.c to not use ir-functions.c
[cascardo/linux.git]
/
drivers
/
media
/
video
/
ir-kbd-i2c.c
diff --git
a/drivers/media/video/ir-kbd-i2c.c
b/drivers/media/video/ir-kbd-i2c.c
index
29d4397
..
27ae8bb
100644
(file)
--- a/
drivers/media/video/ir-kbd-i2c.c
+++ b/
drivers/media/video/ir-kbd-i2c.c
@@
-47,7
+47,7
@@
#include <linux/i2c-id.h>
#include <linux/workqueue.h>
#include <linux/i2c-id.h>
#include <linux/workqueue.h>
-#include <media/ir-co
mmon
.h>
+#include <media/ir-co
re
.h>
#include <media/ir-kbd-i2c.h>
/* ----------------------------------------------------------------------- */
#include <media/ir-kbd-i2c.h>
/* ----------------------------------------------------------------------- */
@@
-272,11
+272,8
@@
static void ir_key_poll(struct IR_i2c *ir)
return;
}
return;
}
- if (0 == rc) {
- ir_input_nokey(ir->input, &ir->ir);
- } else {
- ir_input_keydown(ir->input, &ir->ir, ir_key);
- }
+ if (rc)
+ ir_keydown(ir->input, ir_key, 0);
}
static void ir_work(struct work_struct *work)
}
static void ir_work(struct work_struct *work)
@@
-439,10
+436,7
@@
static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
dev_name(&client->dev));
/* init + register input device */
dev_name(&client->dev));
/* init + register input device */
- err = ir_input_init(input_dev, &ir->ir, ir_type);
- if (err < 0)
- goto err_out_free;
-
+ ir->ir_type = ir_type;
input_dev->id.bustype = BUS_I2C;
input_dev->name = ir->name;
input_dev->phys = ir->phys;
input_dev->id.bustype = BUS_I2C;
input_dev->name = ir->name;
input_dev->phys = ir->phys;