Skip to content

Commit

Permalink
V4L/DVB (6081): ivtv: Fix static structure initialization
Browse files Browse the repository at this point in the history
Convert the initialization of ivtv_i2c_algo_template to C99-style.
Otherwise a future change to struct i2c_algo_bit_data would break
this code.

Also declared that structure const - it's a template after all.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Jean Delvare authored and Mauro Carvalho Chehab committed Oct 10, 2007
1 parent 9c12224 commit aeb292d
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions drivers/media/video/ivtv/ivtv-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -536,14 +536,13 @@ static struct i2c_adapter ivtv_i2c_adap_template = {
#endif
};

static struct i2c_algo_bit_data ivtv_i2c_algo_template = {
NULL, /* ?? */
ivtv_setsda_old, /* setsda function */
ivtv_setscl_old, /* " */
ivtv_getsda_old, /* " */
ivtv_getscl_old, /* " */
10, /* udelay */
200 /* timeout */
static const struct i2c_algo_bit_data ivtv_i2c_algo_template = {
.setsda = ivtv_setsda_old,
.setscl = ivtv_setscl_old,
.getsda = ivtv_getsda_old,
.getscl = ivtv_getscl_old,
.udelay = 10,
.timeout = 200,
};

static struct i2c_client ivtv_i2c_client_template = {
Expand Down

0 comments on commit aeb292d

Please sign in to comment.