Commit 38ef6aa8 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (13616): IR: rename ir_input_free as ir_input_unregister 



Now, ir_input_free does more than just freeing the keytab. Better to
rename it as ir_input_unregister.

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

drivers/media/IR/ir-keytable.c

+2 −2
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ int ir_input_register(struct input_dev *input_dev, 
}

EXPORT_SYMBOL_GPL(ir_input_register);



void ir_input_free(struct input_dev *dev)

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;
@@ -467,7 +467,7 @@ void ir_input_free(struct input_dev *dev) 
	kfree(ir_dev);

	input_set_drvdata(dev, NULL);

}

EXPORT_SYMBOL_GPL(ir_input_free);

EXPORT_SYMBOL_GPL(ir_input_unregister);



int ir_core_debug;    /* ir_debug level (0,1,2) */

EXPORT_SYMBOL_GPL(ir_core_debug);

drivers/media/dvb/dm1105/dm1105.c

+2 −2
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105) 


	err = input_register_device(input_dev);

	if (err) {

		ir_input_free(input_dev);

		ir_input_unregister(input_dev);

		input_free_device(input_dev);

		return err;

	}
@@ -623,7 +623,7 @@ int __devinit dm1105_ir_init(struct dm1105dvb *dm1105) 


void __devexit dm1105_ir_exit(struct dm1105dvb *dm1105)

{

	ir_input_free(dm1105->ir.input_dev);

	ir_input_unregister(dm1105->ir.input_dev);

	input_unregister_device(dm1105->ir.input_dev);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) 
	return 0;



out2:

	ir_input_free(input_dev);

	ir_input_unregister(input_dev);

	input_free_device(input_dev);

out1:

	return error;
@@ -304,7 +304,7 @@ static void msp430_ir_deinit(struct budget_ci *budget_ci) 
	del_timer_sync(&dev->timer);

	ir_input_nokey(dev, &budget_ci->ir.state);



	ir_input_free(dev);

	ir_input_unregister(dev);

	input_unregister_device(dev);

}

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

+2 −2
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ int bttv_input_init(struct bttv *btv) 
	bttv_ir_stop(btv);

	btv->remote = NULL;

 err_out_free:

	ir_input_free(input_dev);

	ir_input_unregister(input_dev);

	input_free_device(input_dev);

	kfree(ir);

	return err;
@@ -415,7 +415,7 @@ void bttv_input_fini(struct bttv *btv) 
		return;



	bttv_ir_stop(btv);

	ir_input_free(btv->remote->dev);

	ir_input_unregister(btv->remote->dev);

	input_unregister_device(btv->remote->dev);

	kfree(btv->remote);

	btv->remote = NULL;

drivers/media/video/cx231xx/cx231xx-input.c

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ int cx231xx_ir_init(struct cx231xx *dev) 
	cx231xx_ir_stop(ir);

	dev->ir = NULL;

err_out_free:

	ir_input_free(input_dev);

	ir_input_unregister(input_dev);

	input_free_device(input_dev);

	kfree(ir);

	return err;
@@ -241,7 +241,7 @@ int cx231xx_ir_fini(struct cx231xx *dev) 
		return 0;



	cx231xx_ir_stop(ir);

	ir_input_free(ir->input);

	ir_input_unregister(ir->input);

	input_unregister_device(ir->input);

	kfree(ir);