forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
75543cce0c
commit
38ef6aa884
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
||||
|
@ -407,7 +407,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
|
||||
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 @@ void cx23885_input_fini(struct cx23885_dev *dev)
|
||||
|
||||
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;
|
||||
|
@ -393,7 +393,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
|
||||
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 @@ int cx88_ir_fini(struct cx88_core *core)
|
||||
return 0;
|
||||
|
||||
cx88_ir_stop(core, ir);
|
||||
ir_input_free(ir->input);
|
||||
ir_input_unregister(ir->input);
|
||||
input_unregister_device(ir->input);
|
||||
kfree(ir);
|
||||
|
||||
|
@ -422,7 +422,7 @@ int em28xx_ir_init(struct em28xx *dev)
|
||||
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 @@ int em28xx_ir_fini(struct em28xx *dev)
|
||||
return 0;
|
||||
|
||||
em28xx_ir_stop(ir);
|
||||
ir_input_free(ir->input);
|
||||
ir_input_unregister(ir->input);
|
||||
input_unregister_device(ir->input);
|
||||
kfree(ir);
|
||||
|
||||
|
@ -460,7 +460,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
||||
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 @@ static int ir_remove(struct i2c_client *client)
|
||||
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 */
|
||||
|
@ -742,7 +742,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
|
||||
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 @@ void saa7134_input_fini(struct saa7134_dev *dev)
|
||||
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;
|
||||
|
@ -57,6 +57,6 @@ int ir_set_keycode_table(struct input_dev *input_dev,
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user