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: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index ddb8a0f..e9c9bd3 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -450,7 +450,7 @@
}
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 @@
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);
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 53e3f2a..34e4e56 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -613,7 +613,7 @@
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 @@
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);
}
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 7d193eb..9c9070a 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -286,7 +286,7 @@
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 @@
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);
}
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 84a957e..0e1a7aa 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -403,7 +403,7 @@
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 @@
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;
diff --git a/drivers/media/video/cx231xx/cx231xx-input.c b/drivers/media/video/cx231xx/cx231xx-input.c
index cd135f0..5eba1ec 100644
--- a/drivers/media/video/cx231xx/cx231xx-input.c
+++ b/drivers/media/video/cx231xx/cx231xx-input.c
@@ -226,7 +226,7 @@
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 @@
return 0;
cx231xx_ir_stop(ir);
- ir_input_free(ir->input);
+ ir_input_unregister(ir->input);
input_unregister_device(ir->input);
kfree(ir);
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index 469e083..2a5e4d9 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -407,7 +407,7 @@
cx23885_input_ir_stop(dev);
dev->ir_input = NULL;
err_out_free:
- ir_input_free(input_dev);
+ ir_input_unregister(input_dev);
input_free_device(input_dev);
kfree(ir);
return ret;
@@ -420,7 +420,7 @@
if (dev->ir_input == NULL)
return;
- ir_input_free(dev->ir_input->dev);
+ ir_input_unregister(dev->ir_input->dev);
input_unregister_device(dev->ir_input->dev);
kfree(dev->ir_input);
dev->ir_input = NULL;
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 92b8cdf..d4dc2c2 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -393,7 +393,7 @@
cx88_ir_stop(core, ir);
core->ir = NULL;
err_out_free:
- ir_input_free(input_dev);
+ ir_input_unregister(input_dev);
input_free_device(input_dev);
kfree(ir);
return err;
@@ -408,7 +408,7 @@
return 0;
cx88_ir_stop(core, ir);
- ir_input_free(ir->input);
+ ir_input_unregister(ir->input);
input_unregister_device(ir->input);
kfree(ir);
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 5ddeb42..9dc4e14 100644
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -422,7 +422,7 @@
em28xx_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;
@@ -437,7 +437,7 @@
return 0;
em28xx_ir_stop(ir);
- ir_input_free(ir->input);
+ ir_input_unregister(ir->input);
input_unregister_device(ir->input);
kfree(ir);
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 2856e78..9d8e78d 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -460,7 +460,7 @@
return 0;
err_out_free:
- ir_input_free(input_dev);
+ ir_input_unregister(input_dev);
input_free_device(input_dev);
kfree(ir);
return err;
@@ -474,7 +474,7 @@
cancel_delayed_work_sync(&ir->work);
/* unregister device */
- ir_input_free(ir->input);
+ ir_input_unregister(ir->input);
input_unregister_device(ir->input);
/* free memory */
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 411a841..5093e7a 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -742,7 +742,7 @@
saa7134_ir_stop(dev);
dev->remote = NULL;
err_out_free:
- ir_input_free(input_dev);
+ ir_input_unregister(input_dev);
input_free_device(input_dev);
kfree(ir);
return err;
@@ -754,7 +754,7 @@
return;
saa7134_ir_stop(dev);
- ir_input_free(dev->remote->dev);
+ ir_input_unregister(dev->remote->dev);
input_unregister_device(dev->remote->dev);
kfree(dev->remote);
dev->remote = NULL;
diff --git a/include/media/ir-core.h b/include/media/ir-core.h
index ea76c19..299d201 100644
--- a/include/media/ir-core.h
+++ b/include/media/ir-core.h
@@ -57,6 +57,6 @@
int ir_roundup_tablesize(int n_elems);
int ir_input_register(struct input_dev *dev,
struct ir_scancode_table *ir_codes);
-void ir_input_free(struct input_dev *input_dev);
+void ir_input_unregister(struct input_dev *input_dev);
#endif