Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/media/video/ivtv/ivtv-i2c.c

+7 −8
Original line number Diff line number Diff line
@@ -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 = {