Commit aeb292d1 authored by Jean Delvare's avatar Jean Delvare Committed by Mauro Carvalho Chehab

V4L/DVB (6081): ivtv: Fix static structure initialization

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: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 9c12224a
...@@ -536,14 +536,13 @@ static struct i2c_adapter ivtv_i2c_adap_template = { ...@@ -536,14 +536,13 @@ static struct i2c_adapter ivtv_i2c_adap_template = {
#endif #endif
}; };
static struct i2c_algo_bit_data ivtv_i2c_algo_template = { static const struct i2c_algo_bit_data ivtv_i2c_algo_template = {
NULL, /* ?? */ .setsda = ivtv_setsda_old,
ivtv_setsda_old, /* setsda function */ .setscl = ivtv_setscl_old,
ivtv_setscl_old, /* " */ .getsda = ivtv_getsda_old,
ivtv_getsda_old, /* " */ .getscl = ivtv_getscl_old,
ivtv_getscl_old, /* " */ .udelay = 10,
10, /* udelay */ .timeout = 200,
200 /* timeout */
}; };
static struct i2c_client ivtv_i2c_client_template = { static struct i2c_client ivtv_i2c_client_template = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment