mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Mauro Carvalho Chehab 2010-04-02 13:18:42 -03:00
parent 6686fa6917
commit b2245ba164
12 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/IR/ir-keytable.c
View File

@ -461,7 +461,7 @@ static void ir_close(struct input_dev *input_dev)
}
/**
* ir_input_register() - sets the IR keycode table and add the handlers
* __ir_input_register() - sets the IR keycode table and add the handlers
* for keymap table get/set
* @input_dev: the struct input_dev descriptor of the device
* @rc_tab: the struct ir_scancode_table table of scancode/keymap
@ -471,7 +471,7 @@ static void ir_close(struct input_dev *input_dev)
* It will register the input/evdev interface for the device and
* register the syfs code for IR class
*/
int ir_input_register(struct input_dev *input_dev,
int __ir_input_register(struct input_dev *input_dev,
const struct ir_scancode_table *rc_tab,
const struct ir_dev_props *props,
const char *driver_name)
@ -539,7 +539,7 @@ err:
kfree(ir_dev);
return rc;
}
EXPORT_SYMBOL_GPL(ir_input_register);
EXPORT_SYMBOL_GPL(__ir_input_register);
/**
* ir_input_unregister() - unregisters IR and frees resources

2
drivers/media/dvb/dm1105/dm1105.c
View File

@ -630,7 +630,7 @@ int __devinit dm1105_ir_init(struct dm1105_dev *dm1105)
INIT_WORK(&dm1105->ir.work, dm1105_emit_key);
err = ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME);
err = __ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME);
return err;
}

2
drivers/media/dvb/mantis/mantis_input.c
View File

@ -128,7 +128,7 @@ int mantis_input_init(struct mantis_pci *mantis)
rc->id.version = 1;
rc->dev = mantis->pdev->dev;
err = ir_input_register(rc, &ir_mantis, NULL, MODULE_NAME);
err = __ir_input_register(rc, &ir_mantis, NULL, MODULE_NAME);
if (err) {
dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err);
input_free_device(rc);

2
drivers/media/dvb/ttpci/budget-ci.c
View File

@ -256,7 +256,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci)
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 = ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME);
error = __ir_input_register(input_dev, ir_codes, NULL, MODULE_NAME);
if (error) {
printk(KERN_ERR "budget_ci: could not init driver for IR device (code %d)\n", error);
return error;

2
drivers/media/video/bt8xx/bttv-input.c
View File

@ -392,7 +392,7 @@ int bttv_input_init(struct bttv *btv)
bttv_ir_start(btv, ir);
/* all done */
err = ir_input_register(btv->remote->dev, ir_codes, NULL, MODULE_NAME);
err = __ir_input_register(btv->remote->dev, ir_codes, NULL, MODULE_NAME);
if (err)
goto err_out_stop;

2
drivers/media/video/cx231xx/cx231xx-input.c
View File

@ -219,7 +219,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
cx231xx_ir_start(ir);
/* all done */
err = ir_input_register(ir->input, dev->board.ir_codes,
err = __ir_input_register(ir->input, dev->board.ir_codes,
NULL, MODULE_NAME);
if (err)
goto err_out_stop;

2
drivers/media/video/cx23885/cx23885-input.c
View File

@ -400,7 +400,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
dev->ir_input = ir;
cx23885_input_ir_start(dev);
ret = ir_input_register(ir->dev, ir_codes, NULL, MODULE_NAME);
ret = __ir_input_register(ir->dev, ir_codes, NULL, MODULE_NAME);
if (ret)
goto err_out_stop;

2
drivers/media/video/cx88/cx88-input.c
View File

@ -439,7 +439,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
ir->props.close = cx88_ir_close;
/* all done */
err = ir_input_register(ir->input, ir_codes, &ir->props, MODULE_NAME);
err = __ir_input_register(ir->input, ir_codes, &ir->props, MODULE_NAME);
if (err)
goto err_out_free;

2
drivers/media/video/em28xx/em28xx-input.c
View File

@ -475,7 +475,7 @@ int em28xx_ir_init(struct em28xx *dev)
em28xx_ir_start(ir);
/* all done */
err = ir_input_register(ir->input, dev->board.ir_codes,
err = __ir_input_register(ir->input, dev->board.ir_codes,
&ir->props, MODULE_NAME);
if (err)
goto err_out_stop;

2
drivers/media/video/ir-kbd-i2c.c
View File

@ -447,7 +447,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
input_dev->name = ir->name;
input_dev->phys = ir->phys;
err = ir_input_register(ir->input, ir->ir_codes, NULL, MODULE_NAME);
err = __ir_input_register(ir->input, ir->ir_codes, NULL, MODULE_NAME);
if (err)
goto err_out_free;

2
drivers/media/video/saa7134/saa7134-input.c
View File

@ -877,7 +877,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
}
input_dev->dev.parent = &dev->pci->dev;
err = ir_input_register(ir->dev, ir_codes, &ir->props, MODULE_NAME);
err = __ir_input_register(ir->dev, ir_codes, &ir->props, MODULE_NAME);
if (err)
goto err_out_free;
if (ir_codes->ir_type != IR_TYPE_OTHER) {

26
include/media/ir-core.h
View File

@ -119,23 +119,37 @@ EXPORT_SYMBOL_GPL(IR_KEYTABLE(tabname))
#define DEFINE_LEGACY_IR_KEYTABLE(tabname) \
DEFINE_IR_KEYTABLE(tabname, IR_TYPE_UNKNOWN)
/* Routines from rc-map.c */
int ir_register_map(struct rc_keymap *map);
void ir_unregister_map(struct rc_keymap *map);
struct ir_scancode_table *get_rc_map(const char *name);
/* Routines from ir-keytable.c */
u32 ir_g_keycode_from_table(struct input_dev *input_dev,
u32 scancode);
void ir_keyup(struct input_dev *dev);
void ir_keydown(struct input_dev *dev, int scancode);
int ir_input_register(struct input_dev *dev,
int __ir_input_register(struct input_dev *dev,
const struct ir_scancode_table *ir_codes,
const struct ir_dev_props *props,
const char *driver_name);
void ir_input_unregister(struct input_dev *input_dev);
/* Routines from rc-map.c */
static inline int ir_input_register(struct input_dev *dev,
const char *map_name,
const struct ir_dev_props *props,
const char *driver_name) {
struct ir_scancode_table *ir_codes;
int ir_register_map(struct rc_keymap *map);
void ir_unregister_map(struct rc_keymap *map);
struct ir_scancode_table *get_rc_map(const char *name);
ir_codes = get_rc_map(map_name);
if (!ir_codes)
return -EINVAL;
return __ir_input_register(dev, ir_codes, props, driver_name);
}
void ir_input_unregister(struct input_dev *input_dev);
/* Routines from ir-sysfs.c */