Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dc50942 authored by David Härdeman's avatar David Härdeman Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: ir-core: partially convert ir-kbd-i2c.c to not use ir-functions.c



Partially convert drivers/media/video/ir-kbd-i2c.c to
not use ir-functions.c

Signed-off-by: default avatarDavid Härdeman <david@hardeman.nu>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3bbd3f2d
Loading
Loading
Loading
Loading
+4 −10
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@
#include <linux/i2c-id.h>
#include <linux/workqueue.h>

#include <media/ir-common.h>
#include <media/ir-core.h>
#include <media/ir-kbd-i2c.h>

/* ----------------------------------------------------------------------- */
@@ -272,11 +272,8 @@ static void ir_key_poll(struct IR_i2c *ir)
		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)
@@ -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 */
	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;
+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ struct IR_i2c {
	struct i2c_client      *c;
	struct input_dev       *input;
	struct ir_input_state  ir;

	u64                    ir_type;
	/* Used to avoid fast repeating */
	unsigned char          old;