Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] saa7115: make multi-line comments compliant with CodingStyle

changeset 2ccf12a did a crappy job when added multi-line comment lines,
violating CodingStyle.

Change the comments added there to fulfill CodingStyle, and document
the platform_data using Documentation/kernel-doc-nano-HOWTO.txt.

Cc: Jon Arne Jørgensen <jonarne@jonarne.no>
Cc: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

+43 -30
+14 -10
drivers/media/i2c/saa7115.c
··· 225 225 0x00, 0x00 226 226 }; 227 227 228 - /* This table has one illegal value, and some values that are not 229 - correct according to the datasheet initialization table. 230 - 231 - If you need a table with legal/default values tell the driver in 232 - i2c_board_info.platform_data, and you will get the gm7113c_init 233 - table instead. */ 228 + /* 229 + * This table has one illegal value, and some values that are not 230 + * correct according to the datasheet initialization table. 231 + * 232 + * If you need a table with legal/default values tell the driver in 233 + * i2c_board_info.platform_data, and you will get the gm7113c_init 234 + * table instead. 235 + */ 234 236 235 237 /* SAA7113 Init codes */ 236 238 static const unsigned char saa7113_init[] = { ··· 267 265 0x00, 0x00 268 266 }; 269 267 270 - /* GM7113C is a clone of the SAA7113 chip 271 - This init table is copied out of the saa7113 datasheet. 272 - In R_08 we enable "Automatic Field Detection" [AUFD], 273 - this is disabled when saa711x_set_v4lstd is called. */ 268 + /* 269 + * GM7113C is a clone of the SAA7113 chip 270 + * This init table is copied out of the saa7113 datasheet. 271 + * In R_08 we enable "Automatic Field Detection" [AUFD], 272 + * this is disabled when saa711x_set_v4lstd is called. 273 + */ 274 274 static const unsigned char gm7113c_init[] = { 275 275 R_01_INC_DELAY, 0x08, 276 276 R_02_INPUT_CNTL_1, 0xc0,
+29 -20
include/media/saa7115.h
··· 47 47 #define SAA7111_FMT_YUV411 0xc0 48 48 49 49 /* config flags */ 50 - /* Register 0x85 should set bit 0 to 0 (it's 1 by default). This bit 50 + /* 51 + * Register 0x85 should set bit 0 to 0 (it's 1 by default). This bit 51 52 * controls the IDQ signal polarity which is set to 'inverted' if the bit 52 - * it 1 and to 'default' if it is 0. */ 53 + * it 1 and to 'default' if it is 0. 54 + */ 53 55 #define SAA7115_IDQ_IS_DEFAULT (1 << 0) 54 56 55 57 /* s_crystal_freq values and flags */ ··· 86 84 SAA7113_OFTS_VFLAG_BY_DATA_TYPE 87 85 }; 88 86 89 - /* Register 0x12 "Output control" [Bit 0..3 Or Bit 4..7]: 87 + /* 88 + * Register 0x12 "Output control" [Bit 0..3 Or Bit 4..7]: 90 89 * This is used to select what data is output on the RTS0 and RTS1 pins. 91 90 * RTS1 [Bit 4..7] Defaults to DOT_IN. (This value can not be set for RTS0) 92 91 * RTS0 [Bit 0..3] Defaults to VIPB in gm7113c_init as specified 93 - * in the datasheet, but is set to HREF_HS in the saa7113_init table. */ 92 + * in the datasheet, but is set to HREF_HS in the saa7113_init table. 93 + */ 94 94 enum saa7113_r12_rts { 95 95 SAA7113_RTS_DOT_IN = 0, /* OBS: Only for RTS1 (Default RTS1) */ 96 96 SAA7113_RTS_VIPB, /* Default RTS0 For gm7113c_init */ ··· 112 108 SAA7113_RTS_FID 113 109 }; 114 110 111 + /** 112 + * struct saa7115_platform_data - Allow overriding default initialization 113 + * 114 + * @saa7113_force_gm7113c_init: Force the use of the gm7113c_init table 115 + * instead of saa7113_init table 116 + * (saa7113 only) 117 + * @saa7113_r08_htc: [R_08 - Bit 3..4] 118 + * @saa7113_r10_vrln: [R_10 - Bit 3] 119 + * default: Disabled for gm7113c_init 120 + * Enabled for saa7113c_init 121 + * @saa7113_r10_ofts: [R_10 - Bit 6..7] 122 + * @saa7113_r12_rts0: [R_12 - Bit 0..3] 123 + * @saa7113_r12_rts1: [R_12 - Bit 4..7] 124 + * @saa7113_r13_adlsb: [R_13 - Bit 7] - default: disabled 125 + */ 115 126 struct saa7115_platform_data { 116 - /* saa7113 only: Force the use of the gm7113c_init table, 117 - * instead of the old saa7113_init table. */ 118 127 bool saa7113_force_gm7113c_init; 119 - 120 - /* SAA7113/GM7113C Specific configurations */ 121 - enum saa7113_r08_htc *saa7113_r08_htc; /* [R_08 - Bit 3..4] */ 122 - 123 - bool *saa7113_r10_vrln; /* [R_10 - Bit 3] 124 - Disabled for gm7113c_init 125 - Enabled for saa7113c_init */ 126 - enum saa7113_r10_ofts *saa7113_r10_ofts; /* [R_10 - Bit 6..7] */ 127 - 128 - enum saa7113_r12_rts *saa7113_r12_rts0; /* [R_12 - Bit 0..3] */ 129 - enum saa7113_r12_rts *saa7113_r12_rts1; /* [R_12 - Bit 4..7] */ 130 - 131 - bool *saa7113_r13_adlsb; /* [R_13 - Bit 7] 132 - Default disabled */ 128 + enum saa7113_r08_htc *saa7113_r08_htc; 129 + bool *saa7113_r10_vrln; 130 + enum saa7113_r10_ofts *saa7113_r10_ofts; 131 + enum saa7113_r12_rts *saa7113_r12_rts0; 132 + enum saa7113_r12_rts *saa7113_r12_rts1; 133 + bool *saa7113_r13_adlsb; 133 134 }; 134 135 135 136 #endif