em28xx: Coding style fixes and a typo correction
PATCH v2 1/1 em28xx: Coding style fixes and a typo correction
Lots of coding style fixes and a typo correction for em28xx.
Priority: low
Signed-off-by Nicola Soranzo <[email protected]>
---
v2: Addressed review comments from Mauro Carvalho Chehab
linux/drivers/media/video/em28xx/em28xx-audio.c +5 -7
@@ -264,8 +264,7 @@ static int em28xx_cmd(struct em28xx *dev }#if LINUX_VERSION_CODE <=KERNEL_VERSION (2 ,6 ,16 ) -static int snd_pcm_alloc_vmalloc_buffer (snd_pcm_substream_t *subs, - size_t size) +static int snd_pcm_alloc_vmalloc_buffer(snd_pcm_substream_t *subs, size_t size)#else static int snd_pcm_alloc_vmalloc_buffer (struct snd_pcm_substream *subs,size_t size)
@@ -277,7 +276,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_runtime *runtime = subs->runtime;#endif -dprintk ("Alocating vbuffer\n" ); +dprintk ("Allocating vbuffer\n" );if (runtime->dma_area) {if (runtime->dma_bytes > size)return 0 ;
@@ -454,8 +453,8 @@ static int snd_em28xx_capture_trigger(st {struct em28xx *dev =snd_pcm_substream_chip (substream); -dprintk ("Should %s capture\n" , (cmd ==SNDRV_PCM_TRIGGER_START )? -"start" :"stop" ); +dprintk ("Should %s capture\n" , (cmd ==SNDRV_PCM_TRIGGER_START ) ? +"start" :"stop" );switch (cmd) {case SNDRV_PCM_TRIGGER_START :em28xx_cmd (dev,EM28XX_CAPTURE_STREAM_EN ,1 );
@@ -476,8 +475,7 @@ static snd_pcm_uframes_t snd_em28xx_capt *substream)#endif { -unsigned long flags; - +unsigned long flags;struct em28xx *dev;snd_pcm_uframes_t hwptr_done;
linux/drivers/media/video/em28xx/em28xx-cards.c +13 -11
@@ -257,7 +257,7 @@ struct em28xx_board em28xx_boards[] = { .name = "Hauppauge WinTV USB 2", .tuner_type = TUNER_PHILIPS_FM1236_MK3, .tda9887_conf =TDA9887_PRESENT | -TDA9887_PORT1_ACTIVE | +TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE, .decoder = EM28XX_TVP5150, .has_msp34xx = 1,
@@ -534,7 +534,7 @@ struct em28xx_board em28xx_boards[] = { }, [EM2861_BOARD_YAKUMO_MOVIE_MIXER] = { .name = "Yakumo MovieMixer", - .tuner_type = TUNER_ABSENT, /* Capture only device */ + .tuner_type = TUNER_ABSENT, /* Capture only device */ .decoder = EM28XX_TVP5150, .input = { { .type = EM28XX_VMUX_TELEVISION,
@@ -902,11 +902,11 @@ struct em28xx_board em28xx_boards[] = { } }, }, [EM2800_BOARD_GRABBEEX_USB2800] = { - .name = "eMPIA Technology, Inc. GrabBeeX+ Video Encoder", - .is_em2800 = 1, - .decoder = EM28XX_SAA711X, - .tuner_type = TUNER_ABSENT, /* capture only board */ - .input = { { + .name = "eMPIA Technology, Inc. GrabBeeX+ Video Encoder", + .is_em2800 = 1, + .decoder = EM28XX_SAA711X, + .tuner_type = TUNER_ABSENT, /* capture only board */ + .input = { { .type = EM28XX_VMUX_COMPOSITE1, .vmux = SAA7115_COMPOSITE0, .amux = EM28XX_AMUX_LINE_IN,
@@ -1282,7 +1282,9 @@ struct em28xx_board em28xx_boards[] = { .has_dvb = 1, .dvb_gpio = kworld_330u_digital, .xclk = EM28XX_XCLK_FREQUENCY_12MHZ, - .i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE | EM28XX_I2C_EEPROM_ON_BOARD | EM28XX_I2C_EEPROM_KEY_VALID, + .i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE | + EM28XX_I2C_EEPROM_ON_BOARD | + EM28XX_I2C_EEPROM_KEY_VALID, .input = { { .type = EM28XX_VMUX_TELEVISION, .vmux = TVP5150_COMPOSITE0,
@@ -1321,7 +1323,7 @@ struct em28xx_board em28xx_boards[] = {const unsigned int em28xx_bcount =ARRAY_SIZE (em28xx_boards);/* table of devices that work with this driver */ -struct usb_device_id em28xx_id_table [] = { +struct usb_device_id em28xx_id_table[] = { {USB_DEVICE (0xeb1a ,0x2750 ), .driver_info =EM2750_BOARD_UNKNOWN }, {USB_DEVICE (0xeb1a ,0x2751 ),
@@ -1425,7 +1427,7 @@ MODULE_DEVICE_TABLE(usb, em28xx_id_table/* * EEPROM hash table for devices with generic USB IDs */ -static struct em28xx_hash_table em28xx_eeprom_hash [] = { +static struct em28xx_hash_table em28xx_eeprom_hash[] = {/* P/N: SA 60002070465 Tuner: TVF7533-MF */ {0x6ce05a8f ,EM2820_BOARD_PROLINK_PLAYTV_USB2 ,TUNER_YMEC_TVF_5533MF }, {0x72cc5a8b ,EM2820_BOARD_PROLINK_PLAYTV_BOX4_USB2 ,TUNER_YMEC_TVF_5533MF },
@@ -1457,7 +1459,7 @@ int em28xx_tuner_callback(void *ptr, int }EXPORT_SYMBOL_GPL (em28xx_tuner_callback); -static void inline em28xx_set_model (struct em28xx *dev) +static inline void em28xx_set_model (struct em28xx *dev) {memcpy (&dev->board, &em28xx_boards[dev->model],sizeof (dev->board));
linux/drivers/media/video/em28xx/em28xx-core.c +10 -9
@@ -33,8 +33,8 @@/* #define ENABLE_DEBUG_ISOC_FRAMES */ static unsigned int core_debug; -module_param (core_debug,int,0644 ); -MODULE_PARM_DESC (core_debug,"enable debug messages [core]" ); +module_param (core_debug, int,0644 ); +MODULE_PARM_DESC (core_debug,"enable debug messages [core]" ); #define em28xx_coredbg(fmt, arg...) do {\ if (core_debug) \
@@ -42,8 +42,8 @@ MODULE_PARM_DESC(core_debug,"enable debu dev->name, __func__ , ##arg); } while (0)static unsigned int reg_debug; -module_param (reg_debug,int,0644 ); -MODULE_PARM_DESC (reg_debug,"enable debug messages [URB reg]" ); +module_param (reg_debug, int,0644 ); +MODULE_PARM_DESC (reg_debug,"enable debug messages [URB reg]" ); #define em28xx_regdbg(fmt, arg...) do {\ if (reg_debug) \
@@ -77,7 +77,7 @@ int em28xx_read_reg_req_len(struct em28xreturn -EINVAL ;if (reg_debug) { - printk( KERN_DEBUG "(pipe 0x%08x): " + printk(KERN_DEBUG "(pipe 0x%08x): " "IN: %02x %02x %02x %02x %02x %02x %02x %02x ", pipe, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
@@ -154,7 +154,7 @@ int em28xx_write_regs_req(struct em28xxif (reg_debug) {int byte; - printk( KERN_DEBUG "(pipe 0x%08x): " + printk(KERN_DEBUG "(pipe 0x%08x): " "OUT: %02x %02x %02x %02x %02x %02x %02x %02x >>>", pipe, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
@@ -462,7 +462,8 @@ int em28xx_audio_analog_set(struct em28xif (dev->ctl_aoutput &EM28XX_AOUT_PCM_IN ) {int sel =ac97_return_record_select (dev->ctl_aoutput); -/* Use the same input for both left and right channels */ +/* Use the same input for both left and right +channels */ sel |= (sel <<8 );em28xx_write_ac97 (dev,AC97_RECORD_SELECT , sel);
@@ -698,7 +699,7 @@ static int em28xx_scaler_set(struct em28em28xx_write_regs (dev,EM28XX_R32_VSCALELOW , (char *)buf,2 );/* it seems that both H and V scalers must be active to work correctly */ - mode = (h || v)?0x30 :0x00 ; + mode = (h || v) ?0x30 :0x00 ; }return em28xx_write_reg_bits (dev,EM28XX_R26_COMPR , mode,0x30 ); }
@@ -954,7 +955,7 @@ int em28xx_init_isoc(struct em28xx *dev,em28xx_err ("unable to allocate %i bytes for transfer" " buffer %i%s\n" , sb_size, i, -in_interrupt ()?" while in int" :"" ); +in_interrupt () ?" while in int" :"" );em28xx_uninit_isoc (dev);return -ENOMEM ; }
linux/drivers/media/video/em28xx/em28xx-i2c.c +4 -2
@@ -402,10 +402,12 @@ static int em28xx_i2c_eeprom(struct em28 dev->name);break ;case 2 : -printk (KERN_INFO "%s:\tI2S audio, sample rate=32k\n" , dev->name); +printk (KERN_INFO "%s:\tI2S audio, sample rate=32k\n" , + dev->name);break ;case 3 : -printk (KERN_INFO "%s:\tI2S audio, 3 sample rates\n" , dev->name); +printk (KERN_INFO "%s:\tI2S audio, 3 sample rates\n" , + dev->name);break ; }
linux/drivers/media/video/em28xx/em28xx-video.c +25 -18
133 lines not on this page · raw message
linux/drivers/media/video/em28xx/em28xx.h +4 -2
@@ -156,7 +156,8 @@*/ /* time to wait when stopping the isoc transfer */ -#define EM28XX_URB_TIMEOUT msecs_to_jiffies(EM28XX_NUM_BUFS * EM28XX_NUM_PACKETS) +#define EM28XX_URB_TIMEOUT \ + msecs_to_jiffies(EM28XX_NUM_BUFS * EM28XX_NUM_PACKETS)/* time in msecs to wait for i2c writes to finish */ #define EM2800_I2C_WRITE_TIMEOUT 20
@@ -533,7 +534,8 @@ struct em28xx {int num_alt;/* Number of alternative settings */ unsigned int *alt_max_pkt_size;/* array of wMaxPacketSize */ struct urb *urb[EM28XX_NUM_BUFS ];/* urb for isoc transfers */ -char *transfer_buffer[EM28XX_NUM_BUFS ];/* transfer buffers for isoc transfer */ +char *transfer_buffer[EM28XX_NUM_BUFS ];/* transfer buffers for isoc +transfer */ char urb_buf[URB_MAX_CTRL_SIZE ];/* urb control msg buffer */ /* helper funcs that call usb_control_msg */