diff options
Diffstat (limited to 'linux/drivers/media/video/cx231xx/cx231xx-input.c')
| -rw-r--r-- | linux/drivers/media/video/cx231xx/cx231xx-input.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/linux/drivers/media/video/cx231xx/cx231xx-input.c b/linux/drivers/media/video/cx231xx/cx231xx-input.c index e2e0a2f2a..32291630f 100644 --- a/linux/drivers/media/video/cx231xx/cx231xx-input.c +++ b/linux/drivers/media/video/cx231xx/cx231xx-input.c @@ -2,9 +2,9 @@ handle cx231xx IR remotes via linux kernel input layer. Copyright (C) 2008 <srinivasa.deevi at conexant dot com> - Based on em28xx driver + Based on em28xx driver - < This is a place holder for IR now.> + < This is a place holder for IR now.> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,7 +31,6 @@ #include "compat.h" #include "cx231xx.h" - static unsigned int ir_debug; module_param(ir_debug, int, 0644); MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]"); @@ -54,7 +53,7 @@ struct cx231xx_ir_poll_result { unsigned int toggle_bit:1; unsigned int read_count:7; u8 rc_address; - u8 rc_data[4]; + u8 rc_data[4]; }; struct cx231xx_IR { @@ -72,11 +71,9 @@ struct cx231xx_IR { unsigned int last_readcount; unsigned int repeat_interval; - int (*get_key)(struct cx231xx_IR *, struct cx231xx_ir_poll_result *); + int (*get_key) (struct cx231xx_IR *, struct cx231xx_ir_poll_result *); }; - - /********************************************************** Polling code for cx231xx **********************************************************/ @@ -199,18 +196,17 @@ int cx231xx_ir_init(struct cx231xx *dev) ir->input = input_dev; /* Setup the proper handler based on the chip */ - switch (dev->chip_id) { - default: - printk("Unrecognized cx231xx chip id: IR not supported\n"); - goto err_out_free; + switch (dev->chip_id) { + default: + printk("Unrecognized cx231xx chip id: IR not supported\n"); + goto err_out_free; } /* This is how often we ask the chip for IR information */ - ir->polling = 100; /* ms */ + ir->polling = 100; /* ms */ /* init input device */ - snprintf(ir->name, sizeof(ir->name), "cx231xx IR (%s)", - dev->name); + snprintf(ir->name, sizeof(ir->name), "cx231xx IR (%s)", dev->name); usb_make_path(dev->udev, ir->phys, sizeof(ir->phys)); strlcat(ir->phys, "/input0", sizeof(ir->phys)); @@ -240,10 +236,10 @@ int cx231xx_ir_init(struct cx231xx *dev) goto err_out_stop; return 0; - err_out_stop: + err_out_stop: cx231xx_ir_stop(ir); dev->ir = NULL; - err_out_free: + err_out_free: input_free_device(input_dev); kfree(ir); return err; @@ -264,4 +260,4 @@ int cx231xx_ir_fini(struct cx231xx *dev) /* done */ dev->ir = NULL; return 0; -}
\ No newline at end of file +} |