diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-04-02 12:18:42 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-19 11:56:50 -0400 |
commit | b2245ba1644eb1eba400fd04c6e7bb3ab2d4a8fa (patch) | |
tree | 0b0213d19f51cd6cda191a91b970fa1fcc1d49b9 /drivers/media/dvb | |
parent | 6686fa6917caaaaf3d595df6accedb87607517c9 (diff) |
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: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/mantis/mantis_input.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget-ci.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index ff62dc8633c..416c29bf78d 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
@@ -630,7 +630,7 @@ int __devinit dm1105_ir_init(struct dm1105_dev *dm1105) | |||
630 | 630 | ||
631 | INIT_WORK(&dm1105->ir.work, dm1105_emit_key); | 631 | INIT_WORK(&dm1105->ir.work, dm1105_emit_key); |
632 | 632 | ||
633 | err = ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME); | 633 | err = __ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME); |
634 | 634 | ||
635 | return err; | 635 | return err; |
636 | } | 636 | } |
diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c index 6baf3022968..3d4e4663220 100644 --- a/drivers/media/dvb/mantis/mantis_input.c +++ b/drivers/media/dvb/mantis/mantis_input.c | |||
@@ -128,7 +128,7 @@ int mantis_input_init(struct mantis_pci *mantis) | |||
128 | rc->id.version = 1; | 128 | rc->id.version = 1; |
129 | rc->dev = mantis->pdev->dev; | 129 | rc->dev = mantis->pdev->dev; |
130 | 130 | ||
131 | err = ir_input_register(rc, &ir_mantis, NULL, MODULE_NAME); | 131 | err = __ir_input_register(rc, &ir_mantis, NULL, MODULE_NAME); |
132 | if (err) { | 132 | if (err) { |
133 | dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err); | 133 | dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err); |
134 | input_free_device(rc); | 134 | input_free_device(rc); |
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index 75c640e5966..ab7479ad592 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c | |||
@@ -256,7 +256,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) | |||
256 | budget_ci->ir.timer_keyup.function = msp430_ir_keyup; | 256 | budget_ci->ir.timer_keyup.function = msp430_ir_keyup; |
257 | budget_ci->ir.timer_keyup.data = (unsigned long) &budget_ci->ir; | 257 | budget_ci->ir.timer_keyup.data = (unsigned long) &budget_ci->ir; |
258 | budget_ci->ir.last_raw = 0xffff; /* An impossible value */ | 258 | budget_ci->ir.last_raw = 0xffff; /* An impossible value */ |
259 | error = ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME); | 259 | error = __ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME); |
260 | if (error) { | 260 | if (error) { |
261 | printk(KERN_ERR "budget_ci: could not init driver for IR device (code %d)\n", error); | 261 | printk(KERN_ERR "budget_ci: could not init driver for IR device (code %d)\n", error); |
262 | return error; | 262 | return error; |