C99 initializers for drivers/media

@@ -31,20 +31,21 @@
 
 static
 struct dvb_frontend_info bsrv2_info = {
-	name: "Alps BSRV2",
-	type: FE_QPSK,
-	frequency_min: 950000,
-	frequency_max: 2150000,
-	frequency_stepsize: 250,           /* kHz for QPSK frontends */
-	frequency_tolerance: 29500,
-	symbol_rate_min: 1000000,
-	symbol_rate_max: 45000000,
-/*      symbol_rate_tolerance: ???,*/
-	notifier_delay: 50,                /* 1/20 s */
-	caps:   FE_CAN_INVERSION_AUTO |
-		FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
-		FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
-		FE_CAN_QPSK
+	.name			= "Alps BSRV2",
+	.type			= FE_QPSK,
+	.frequency_min		= 950000,
+	.frequency_max		= 2150000,
+	.frequency_stepsize	= 250,  /* kHz for QPSK frontends */
+	.frequency_tolerance	= 29500,
+	.symbol_rate_min	= 1000000,
+	.symbol_rate_max	= 45000000,
+/*      .symbol_rate_tolerance	= ???,*/
+	.notifier_delay		= 50, /* 1/20 s */
+	.caps			= FE_CAN_INVERSION_AUTO |
+				  FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 |
+				  FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 |
+				  FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
+				  FE_CAN_QPSK,
 };
 
 

@@ -75,7 +76,12 @@
 int ves1893_writereg (struct dvb_i2c_bus *i2c, u8 reg, u8 data)
 {
         u8 buf [] = { 0x00, reg, data };
-	struct i2c_msg msg = { addr: 0x08, flags: 0, buf: buf, len: 3 };
+	struct i2c_msg msg = {
+		.addr	= 0x08,
+		.flags	= 0,
+		.buf	= buf,
+		.len	= 3,
+	};
 	int err;
 
         if ((err = i2c->xfer (i2c, &msg, 1)) != 1) {

@@ -93,8 +99,20 @@
 	int ret;
 	u8 b0 [] = { 0x00, reg };
 	u8 b1 [] = { 0 };
-	struct i2c_msg msg [] = { { addr: 0x08, flags: 0, buf: b0, len: 2 },
-			   { addr: 0x08, flags: I2C_M_RD, buf: b1, len: 1 } };
+	struct i2c_msg msg [] = {
+		{
+			.addr	= 0x08,
+			.flags	= 0,
+			.buf	= b0,
+			.len	= 2,
+		},
+		{
+			.addr	= 0x08,
+			.flags	= I2C_M_RD,
+			.buf	= b1,
+			.len	= 1,
+		},
+	};
 
 	ret = i2c->xfer (i2c, msg, 2);
 

@@ -109,7 +127,12 @@
 int sp5659_write (struct dvb_i2c_bus *i2c, u8 data [4])
 {
         int ret;
-        struct i2c_msg msg = { addr: 0x61, flags: 0, buf: data, len: 4 };
+        struct i2c_msg msg = {
+		.addr	= 0x61,
+		.flags	= 0,
+		.buf	= data,
+		.len	= 4,
+	};
 
         ret = i2c->xfer (i2c, &msg, 1);
 

96 lines not on this page · raw message

99 lines not on this page · raw message

@@ -94,7 +94,12 @@
 
 	int ret;
 	u8 buf[] = { reg, data };
-	struct i2c_msg msg = { addr:0x1a >> 1, flags:0, buf:buf, len:2 };
+	struct i2c_msg msg = {
+		.addr	= 0x1a >> 1,
+		.flags	= 0,
+		.buf	= buf,
+		.len	= 2,
+	};
 
 	ret = i2c->xfer(i2c, &msg, 1);
 

@@ -116,8 +121,20 @@
 	int ret;
 	u8 b0[] = { reg };
 	u8 b1[] = { 0 };
-	struct i2c_msg msg[] = { {addr: 0x1a >> 1, flags: 0, buf: b0, len:1},
-			  {addr: 0x1a >> 1, flags: I2C_M_RD, buf: b1, len:1} };
+	struct i2c_msg msg[] = {
+		{
+			.addr	= 0x1a >> 1,
+			.flags	= 0,
+			.buf	= b0,
+			.len	= 1,
+		},
+		{
+			.addr	= 0x1a >> 1,
+			.flags	= I2C_M_RD,
+			.buf	= b1,
+			.len	= 1
+		},
+	};
 
 	ret = i2c->xfer(i2c, msg, 2);
 

@@ -191,8 +208,12 @@
 {
 
 	int ret;
-	struct i2c_msg msg =
-	    { addr:0xc2 >> 1, flags:0, buf:(u8 *) & tw, len:sizeof (tw) };
+	struct i2c_msg msg = {
+		.addr	= 0xc2 >> 1,
+		.flags	= 0,
+		.buf	= (u8 *) &tw,
+		.len	= sizeof(tw),
+	};
 
 	at76c651_switch_tuner_i2c(i2c, 1);
 

114 lines not on this page · raw message

87 lines not on this page · raw message

175 lines not on this page · raw message

113 lines not on this page · raw message

@@ -58,7 +58,7 @@
 
 
 static
-struct timer_list keyup_timer = { function: av7110_emit_keyup };
+struct timer_list keyup_timer = { .function = av7110_emit_keyup };
 
 
 static

@@ -1173,7 +1173,7 @@
 	.tuner_type     = -1,
 	.pll            = PLL_28,
 	.muxsel         = { 2 },
-	gpiomask:       0
+	.gpiomask       = 0,
 },{
         /* Tomasz Pyra <[email protected]> */
         .name           = "Prolink Pixelview PV-BT878P+ (Rev.4C,8E)",

@@ -1260,7 +1260,7 @@
 },{
         .name           = "Powercolor MTV878/ MTV878R/ MTV878F",
         .video_inputs   = 3,
-        audio_inputs:   2, 
+        .audio_inputs   = 2, 
 	.tuner		= 0,
         .svhs           = 2,
         .gpiomask       = 0x1C800F,  // Bit0-2: Audio select, 8-12:remote control 14:remote valid 15:remote reset

@@ -1300,7 +1300,7 @@
 },{
         .name           = "Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF",
         .video_inputs   = 4,
-        audio_inputs:   3, 
+        .audio_inputs   = 3, 
         .tuner          = 0,
         .svhs           = 2,
         .gpiomask       = 7,

@@ -2786,8 +2786,8 @@
 static struct video_device bttv_video_template =
 {
 	.name     = "UNSET",
-	type:     VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_OVERLAY|
-	          VID_TYPE_CLIPPING|VID_TYPE_SCALES,
+	.type     = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_OVERLAY|
+	            VID_TYPE_CLIPPING|VID_TYPE_SCALES,
 	.hardware = VID_HARDWARE_BT848,
 	.fops     = &bttv_fops,
 	.minor    = -1,

@@ -1319,7 +1319,7 @@
 			     PIC16C54_MISC_SND_NOTMUTE},
 		.inputmute  = PIC16C54_MISC_SND_MUTE,
 	},
-	{ name: NULL } /* EOF */
+	{ .name = NULL } /* EOF */
 };
 
 

72 lines not on this page · raw message

72 lines not on this page · raw message