Commit b2245ba1 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB: ir: prepare IR code for a parameter change at register function 



A latter patch will reuse the ir_input_register with a different meaning.
Before it, change all occurrences to a temporary name.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6686fa69

drivers/media/IR/ir-keytable.c

+3 −3
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static void ir_close(struct input_dev *input_dev) 
}



/**

 * ir_input_register() - sets the IR keycode table and add the handlers

 * __ir_input_register() - sets the IR keycode table and add the handlers

 *			    for keymap table get/set

 * @input_dev:	the struct input_dev descriptor of the device

 * @rc_tab:	the struct ir_scancode_table table of scancode/keymap
@@ -471,7 +471,7 @@ static void ir_close(struct input_dev *input_dev) 
 * It will register the input/evdev interface for the device and

 * register the syfs code for IR class

 */

int ir_input_register(struct input_dev *input_dev,

int __ir_input_register(struct input_dev *input_dev,

		      const struct ir_scancode_table *rc_tab,

		      const struct ir_dev_props *props,

		      const char *driver_name)
@@ -539,7 +539,7 @@ int ir_input_register(struct input_dev *input_dev, 
	kfree(ir_dev);

	return rc;

}

EXPORT_SYMBOL_GPL(ir_input_register);

EXPORT_SYMBOL_GPL(__ir_input_register);



/**

 * ir_input_unregister() - unregisters IR and frees resources

drivers/media/dvb/dm1105/dm1105.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ int __devinit dm1105_ir_init(struct dm1105_dev *dm1105) 


	INIT_WORK(&dm1105->ir.work, dm1105_emit_key);



	err = ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME);

	err = __ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME);



	return err;

}

drivers/media/dvb/mantis/mantis_input.c

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ int mantis_input_init(struct mantis_pci *mantis) 
	rc->id.version	= 1;

	rc->dev		= mantis->pdev->dev;



	err = ir_input_register(rc, &ir_mantis, NULL, MODULE_NAME);

	err = __ir_input_register(rc, &ir_mantis, NULL, MODULE_NAME);

	if (err) {

		dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err);

		input_free_device(rc);

drivers/media/dvb/ttpci/budget-ci.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) 
	budget_ci->ir.timer_keyup.function = msp430_ir_keyup;

	budget_ci->ir.timer_keyup.data = (unsigned long) &budget_ci->ir;

	budget_ci->ir.last_raw = 0xffff; /* An impossible value */

	error = ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME);

	error = __ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME);

	if (error) {

		printk(KERN_ERR "budget_ci: could not init driver for IR device (code %d)\n", error);

		return error;

drivers/media/video/bt8xx/bttv-input.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ int bttv_input_init(struct bttv *btv) 
	bttv_ir_start(btv, ir);



	/* all done */

	err = ir_input_register(btv->remote->dev, ir_codes, NULL, MODULE_NAME);

	err = __ir_input_register(btv->remote->dev, ir_codes, NULL, MODULE_NAME);

	if (err)

		goto err_out_stop;