]> git.neil.brown.name Git - history.git/commitdiff
[PATCH] C99 initializer for drivers/media/dv/frontend/stv0229.c
authorAndrew Morton <akpm@osdl.org>
Thu, 26 Feb 2004 00:27:33 +0000 (16:27 -0800)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 26 Feb 2004 00:27:33 +0000 (16:27 -0800)
From: "Art Haas" <ahaas@airmail.net>

Here's a small patch changing GNU-style initializers to C99 initializers.

drivers/media/dvb/frontends/stv0299.c

index 7409bbd2164089b3053dfa5caef35281d864d444..07cf80625e441838b1509ad9ec2fbff5dc5422e6 100644 (file)
@@ -305,8 +305,12 @@ static int stv0299_readregs (struct dvb_i2c_bus *i2c, u8 reg1, u8 *b, u8 len)
 static int pll_write (struct dvb_i2c_bus *i2c, u8 addr, u8 *data, int len)
 {
        int ret;
-       struct i2c_msg msg = { addr: addr, .flags = 0, .buf = data, .len = len };
-
+       struct i2c_msg msg = {
+               .addr = addr,
+               .flags = 0,
+               .buf = data,
+               .len = len
+       };
 
        stv0299_writereg(i2c, 0x05, 0xb5);      /*  enable i2c repeater on stv0299  */
 
@@ -1154,12 +1158,48 @@ static long probe_tuner (struct dvb_i2c_bus *i2c)
         u8 stat [] = { 0 };
        u8 tda6100_buf [] = { 0, 0 };
        int ret;
-       struct i2c_msg msg1 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt,  len: 2 },
-                           { .addr = 0x60, .flags = I2C_M_RD, .buf = stat, .len = 1 }};
-       struct i2c_msg msg2 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt,  len: 2 },
-                           { .addr = 0x61, .flags = I2C_M_RD, .buf = stat, .len = 1 }};
-       struct i2c_msg msg3 [] = {{ .addr = 0x68, .flags = 0, .buf = rpt,  len: 2 },
-                          { .addr = 0x60, .flags = 0, .buf = tda6100_buf, .len = 2 }};
+       struct i2c_msg msg1 [] = {
+               {
+                       .addr   = 0x68,
+                       .flags  = 0,
+                       .buf    = rpt,
+                       .len    = 2
+               },
+               {
+                       .addr   = 0x60,
+                       .flags  = I2C_M_RD,
+                       .buf    = stat,
+                       .len    = 1
+               }
+       };
+       struct i2c_msg msg2 [] = {
+               {
+                       .addr   = 0x68,
+                       .flags  = 0,
+                       .buf    = rpt,
+                       .len    = 2
+               },
+               {
+                       .addr   = 0x61,
+                       .flags  = I2C_M_RD,
+                       .buf    = stat,
+                       .len    = 1
+               }
+       };
+       struct i2c_msg msg3 [] = {
+               {
+                       .addr   = 0x68,
+                       .flags  = 0,
+                       .buf    = rpt,
+                       .len    = 2
+               },
+               {
+                       .addr   = 0x60,
+                       .flags  = 0,
+                       .buf    = tda6100_buf,
+                       .len    = 2
+               }
+       };
 
        stv0299_writereg (i2c, 0x01, 0x15);
        stv0299_writereg (i2c, 0x02, 0x30);