V4L/DVB (7607): CodingStyle fixes

[linux-2.6-omap-h63xx.git] / drivers / media / video / em28xx / em28xx-input.c

diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c
index 55d45b0032cff0cda5a84844aaceeff096547d0f..bb5807159b8d28638e46c01d7f0621861aedeed4 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-input.c
+++ b/drivers/media/video/em28xx/em28xx-input.c
@@ -22,7 +22,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
@@ -31,25 +30,23 @@
 
 #include "em28xx.h"
 
-static unsigned int disable_ir = 0;
-module_param(disable_ir, int, 0444);
-MODULE_PARM_DESC(disable_ir,"disable infrared remote support");
-
-static unsigned int ir_debug = 0;
+static unsigned int ir_debug;
 module_param(ir_debug, int, 0644);
-MODULE_PARM_DESC(ir_debug,"enable debug messages [IR]");
+MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
 
-#define dprintk(fmt, arg...)   if (ir_debug) \
-       printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg)
+#define dprintk(fmt, arg...) \
+       if (ir_debug) { \
+               printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg); \
+       }
 
 /* ----------------------------------------------------------------------- */
 
-static int get_key_terratec(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+int em28xx_get_key_terratec(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
        unsigned char b;
 
        /* poll IR chip */
-       if (1 != i2c_master_recv(&ir->c,&b,1)) {
+       if (1 != i2c_master_recv(&ir->c, &b, 1)) {
                dprintk("read error\n");
                return -EIO;
        }
@@ -73,30 +70,31 @@ static int get_key_terratec(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 }
 
 
-static int get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+int em28xx_get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
 {
        unsigned char buf[2];
        unsigned char code;
 
        /* poll IR chip */
-       if (2 != i2c_master_recv(&ir->c,buf,2))
+       if (2 != i2c_master_recv(&ir->c, buf, 2))
                return -EIO;
 
        /* Does eliminate repeated parity code */
-       if (buf[1]==0xff)
+       if (buf[1] == 0xff)
                return 0;
 
-       ir->old=buf[1];
+       ir->old = buf[1];
 
        /* Rearranges bits to the right order */
-       code=    ((buf[0]&0x01)<<5) | /* 0010 0000 */
+       code =   ((buf[0]&0x01)<<5) | /* 0010 0000 */
                 ((buf[0]&0x02)<<3) | /* 0001 0000 */
                 ((buf[0]&0x04)<<1) | /* 0000 1000 */
                 ((buf[0]&0x08)>>1) | /* 0000 0100 */
                 ((buf[0]&0x10)>>3) | /* 0000 0010 */
                 ((buf[0]&0x20)>>5);  /* 0000 0001 */
 
-       dprintk("ir hauppauge (em2840): code=0x%02x (rcv=0x%02x)\n",code,buf[0]);
+       dprintk("ir hauppauge (em2840): code=0x%02x (rcv=0x%02x)\n",
+                       code, buf[0]);
 
        /* return key */
        *ir_key = code;
@@ -104,21 +102,21 @@ static int get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
        return 1;
 }
 
-static int get_key_pinnacle_usb_grey(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
+int em28xx_get_key_pinnacle_usb_grey(struct IR_i2c *ir, u32 *ir_key,
+                                    u32 *ir_raw)
 {
        unsigned char buf[3];
 
        /* poll IR chip */
 
-       if (3 != i2c_master_recv(&ir->c,buf,3)) {
+       if (3 != i2c_master_recv(&ir->c, buf, 3)) {
                dprintk("read error\n");
                return -EIO;
        }
 
        dprintk("key %02x\n", buf[2]&0x3f);
-       if (buf[0]!=0x00){
+       if (buf[0] != 0x00)
                return 0;
-       }
 
        *ir_key = buf[2]&0x3f;
        *ir_raw = buf[2]&0x3f;
@@ -126,45 +124,6 @@ static int get_key_pinnacle_usb_grey(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw
        return 1;
 }
 
-/* ----------------------------------------------------------------------- */
-void em28xx_set_ir(struct em28xx * dev,struct IR_i2c *ir)
-{
-       if (disable_ir) {
-               ir->get_key=NULL;
-               return ;
-       }
-
-       /* detect & configure */
-       switch (dev->model) {
-       case (EM2800_BOARD_UNKNOWN):
-               break;
-       case (EM2820_BOARD_UNKNOWN):
-               break;
-       case (EM2800_BOARD_TERRATEC_CINERGY_200):
-       case (EM2820_BOARD_TERRATEC_CINERGY_250):
-               ir->ir_codes = ir_codes_em_terratec;
-               ir->get_key = get_key_terratec;
-               snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM28XX Terratec)");
-               break;
-       case (EM2820_BOARD_PINNACLE_USB_2):
-               ir->ir_codes = ir_codes_pinnacle_grey;
-               ir->get_key = get_key_pinnacle_usb_grey;
-               snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM28XX Pinnacle PCTV)");
-               break;
-       case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):
-               ir->ir_codes = ir_codes_hauppauge_new;
-               ir->get_key = get_key_em_haup;
-               snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (EM2840 Hauppauge)");
-               break;
-       case (EM2820_BOARD_MSI_VOX_USB_2):
-               break;
-       case (EM2800_BOARD_LEADTEK_WINFAST_USBII):
-               break;
-       case (EM2800_BOARD_KWORLD_USB2800):
-               break;
-       }
-}
-
 /* ----------------------------------------------------------------------
  * Local variables:
  * c-basic-offset: 8