Commit 579e7d60 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (13617): ir: move input_register_device() to happen inside ir_input_register() 



We'll need to register a sysfs class for the IR devices. As such, the better
is to have the input_register_device()/input_unregister_device() inside
the ir register/unregister functions.

Also, solves a naming problem with V4L ir_input_init() function, that were,
in fact, registering a device.

While here, do a few cleanups at budget-ci IR logic.

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

drivers/media/IR/ir-functions.c

+1 −3
Original line number Diff line number Diff line
@@ -52,15 +52,13 @@ static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir) 
/* -------------------------------------------------------------------------- */



int ir_input_init(struct input_dev *dev, struct ir_input_state *ir,

		   int ir_type, struct ir_scancode_table *ir_codes)

		   int ir_type)

{

	ir->ir_type = ir_type;



	if (repeat)

		set_bit(EV_REP, dev->evbit);



	ir_input_register(dev, ir_codes);



	return 0;

}

EXPORT_SYMBOL_GPL(ir_input_init);

drivers/media/IR/ir-keytable.c

+14 −6
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
 *  GNU General Public License for more details.

 */



#include <linux/usb/input.h>



#include <linux/usb/input.h>

#include <media/ir-common.h>



#define IR_TAB_MIN_SIZE	32
@@ -408,7 +408,7 @@ int ir_input_register(struct input_dev *input_dev, 
{

	struct ir_input_dev *ir_dev;

	struct ir_scancode  *keymap    = rc_tab->scan;

	int i;

	int i, rc;



	if (rc_tab->scan == NULL || !rc_tab->size)

		return -EINVAL;
@@ -446,26 +446,34 @@ int ir_input_register(struct input_dev *input_dev, 
	input_dev->setkeycode = ir_setkeycode;

	input_set_drvdata(input_dev, ir_dev);



	return 0;

	rc = input_register_device(input_dev);

	if (rc < 0) {

		kfree(rc_tab->scan);

		kfree(ir_dev);

		input_set_drvdata(input_dev, NULL);

	}



	return rc;

}

EXPORT_SYMBOL_GPL(ir_input_register);



void ir_input_unregister(struct input_dev *dev)

{

	struct ir_input_dev *ir_dev = input_get_drvdata(dev);

	struct ir_scancode_table *rc_tab = &ir_dev->rc_tab;

	struct ir_scancode_table *rc_tab;



	if (!rc_tab)

	if (!ir_dev)

		return;



	IR_dprintk(1, "Freed keycode table\n");



	rc_tab = &ir_dev->rc_tab;

	rc_tab->size = 0;

	kfree(rc_tab->scan);

	rc_tab->scan = NULL;



	kfree(ir_dev);

	input_set_drvdata(dev, NULL);

	input_unregister_device(dev);

}

EXPORT_SYMBOL_GPL(ir_input_unregister);

drivers/media/dvb/dm1105/dm1105.c

+3 −9
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105) 
	snprintf(dm1105->ir.input_phys, sizeof(dm1105->ir.input_phys),

		"pci-%s/ir0", pci_name(dm1105->pdev));



	err = ir_input_init(input_dev, &dm1105->ir.ir, ir_type, ir_codes);

	err = ir_input_init(input_dev, &dm1105->ir.ir, ir_type);

	if (err < 0) {

		input_free_device(input_dev);

		return err;
@@ -611,20 +611,14 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105) 


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



	err = input_register_device(input_dev);

	if (err) {

		ir_input_unregister(input_dev);

		input_free_device(input_dev);

		return err;

	}

	err = ir_input_register(input_dev, ir_codes);



	return 0;

	return err;

}



void __devexit dm1105_ir_exit(struct dm1105dvb *dm1105)

{

	ir_input_unregister(dm1105->ir.input_dev);

	input_unregister_device(dm1105->ir.input_dev);

}



static int __devinit dm1105dvb_hw_init(struct dm1105dvb *dm1105dvb)

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

+15 −35
Original line number Diff line number Diff line
@@ -190,12 +190,13 @@ static int msp430_ir_init(struct budget_ci *budget_ci) 
	struct saa7146_dev *saa = budget_ci->budget.dev;

	struct input_dev *input_dev = budget_ci->ir.dev;

	int error;

	struct ir_scancode_table *ir_codes;





	budget_ci->ir.dev = input_dev = input_allocate_device();

	if (!input_dev) {

		printk(KERN_ERR "budget_ci: IR interface initialisation failed\n");

		error = -ENOMEM;

		goto out1;

		return -ENOMEM;

	}



	snprintf(budget_ci->ir.name, sizeof(budget_ci->ir.name),
@@ -217,6 +218,11 @@ static int msp430_ir_init(struct budget_ci *budget_ci) 
	}

	input_dev->dev.parent = &saa->pci->dev;



	if (rc5_device < 0)

		budget_ci->ir.rc5_device = IR_DEVICE_ANY;

	else

		budget_ci->ir.rc5_device = rc5_device;



	/* Select keymap and address */

	switch (budget_ci->budget.dev->pci->subsystem_device) {

	case 0x100c:
@@ -224,53 +230,34 @@ static int msp430_ir_init(struct budget_ci *budget_ci) 
	case 0x1011:

	case 0x1012:

		/* The hauppauge keymap is a superset of these remotes */

		error = ir_input_init(input_dev, &budget_ci->ir.state,

			      IR_TYPE_RC5, &ir_codes_hauppauge_new_table);

		if (error < 0)

			goto out2;

		ir_codes = &ir_codes_hauppauge_new_table;



		if (rc5_device < 0)

			budget_ci->ir.rc5_device = 0x1f;

		else

			budget_ci->ir.rc5_device = rc5_device;

		break;

	case 0x1010:

	case 0x1017:

	case 0x101a:

		/* for the Technotrend 1500 bundled remote */

		error = ir_input_init(input_dev, &budget_ci->ir.state,

			      IR_TYPE_RC5, &ir_codes_tt_1500_table);

		if (error < 0)

			goto out2;



		if (rc5_device < 0)

			budget_ci->ir.rc5_device = IR_DEVICE_ANY;

		else

			budget_ci->ir.rc5_device = rc5_device;

		ir_codes = &ir_codes_tt_1500_table;

		break;

	default:

		/* unknown remote */

		error = ir_input_init(input_dev, &budget_ci->ir.state,

			      IR_TYPE_RC5, &ir_codes_budget_ci_old_table);

		if (error < 0)

			goto out2;



		if (rc5_device < 0)

			budget_ci->ir.rc5_device = IR_DEVICE_ANY;

		else

			budget_ci->ir.rc5_device = rc5_device;

		ir_codes = &ir_codes_budget_ci_old_table;

		break;

	}



	ir_input_init(input_dev, &budget_ci->ir.state, IR_TYPE_RC5);



	/* initialise the key-up timeout handler */

	init_timer(&budget_ci->ir.timer_keyup);

	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 = input_register_device(input_dev);

	error = ir_input_register(input_dev, ir_codes);

	if (error) {

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

		goto out2;

		return error;

	}



	/* note: these must be after input_register_device */
@@ -284,12 +271,6 @@ static int msp430_ir_init(struct budget_ci *budget_ci) 
	saa7146_setgpio(saa, 3, SAA7146_GPIO_IRQHI);



	return 0;



out2:

	ir_input_unregister(input_dev);

	input_free_device(input_dev);

out1:

	return error;

}



static void msp430_ir_deinit(struct budget_ci *budget_ci)
@@ -305,7 +286,6 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci) 
	ir_input_nokey(dev, &budget_ci->ir.state);



	ir_input_unregister(dev);

	input_unregister_device(dev);

}



static int ciintf_read_attribute_mem(struct dvb_ca_en50221 *ca, int slot, int address)

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

+2 −5
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ int bttv_input_init(struct bttv *btv) 
	snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",

		 pci_name(btv->c.pci));



	err = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);

	err = ir_input_init(input_dev, &ir->ir, ir_type);

	if (err < 0)

		goto err_out_free;
@@ -389,7 +389,7 @@ int bttv_input_init(struct bttv *btv) 
	bttv_ir_start(btv, ir);



	/* all done */

	err = input_register_device(btv->remote->dev);

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

	if (err)

		goto err_out_stop;
@@ -403,8 +403,6 @@ int bttv_input_init(struct bttv *btv) 
	bttv_ir_stop(btv);

	btv->remote = NULL;

 err_out_free:

	ir_input_unregister(input_dev);

	input_free_device(input_dev);

	kfree(ir);

	return err;

}
@@ -416,7 +414,6 @@ void bttv_input_fini(struct bttv *btv) 


	bttv_ir_stop(btv);

	ir_input_unregister(btv->remote->dev);

	input_unregister_device(btv->remote->dev);

	kfree(btv->remote);

	btv->remote = NULL;

}