[PATCH] C99 initializers for drivers/media/video

drivers/media/video/adv7175.c

@@ -410,30 +410,30 @@ static void adv717x_dec_use(struct i2c_client *client)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver i2c_driver_adv7175 = {
-	name:		"adv7175",		/* name */
-	id:		I2C_DRIVERID_ADV717x,	/* ID */
-	flags:		I2C_DF_NOTIFY, //I2C_ADV7175, I2C_ADV7175 + 3,
-	attach_adapter:	adv717x_probe,
-	detach_client:	adv717x_detach,
-	command:	adv717x_command,
-	inc_use:	&adv717x_inc_use,
-	dec_use:	&adv717x_dec_use
+	.name		= "adv7175",		/* name */
+	.id		= I2C_DRIVERID_ADV717x,	/* ID */
+	.flags		= I2C_DF_NOTIFY, //I2C_ADV7175, I2C_ADV7175 + 3,
+	.attach_adapter	= adv717x_probe,
+	.detach_client	= adv717x_detach,
+	.command	= adv717x_command,
+	.inc_use	= &adv717x_inc_use,
+	.dec_use	= &adv717x_dec_use
 };
 
 static struct i2c_driver i2c_driver_adv7176 = {
-	name:		"adv7176",		/* name */
-	id:		I2C_DRIVERID_ADV717x,	/* ID */
-	flags:		I2C_DF_NOTIFY, //I2C_ADV7176, I2C_ADV7176 + 3,
-	attach_adapter:	adv717x_probe,
-	detach_client:	adv717x_detach,
-	command:	adv717x_command,
-	inc_use:	&adv717x_inc_use,
-	dec_use:	&adv717x_dec_use
+	.name		= "adv7176",		/* name */
+	.id		= I2C_DRIVERID_ADV717x,	/* ID */
+	.flags		= I2C_DF_NOTIFY, //I2C_ADV7176, I2C_ADV7176 + 3,
+	.attach_adapter	= adv717x_probe,
+	.detach_client	= adv717x_detach,
+	.command	= adv717x_command,
+	.inc_use	= &adv717x_inc_use,
+	.dec_use	= &adv717x_dec_use
 };
 
 static struct i2c_client client_template = {
-	name:		"adv7175_client",
-	driver:		&i2c_driver_adv7175
+	.name		= "adv7175_client",
+	.driver		= &i2c_driver_adv7175
 };
 
 static int adv717x_init(void)

drivers/media/video/bttv-if.c

@@ -262,27 +262,27 @@ void bttv_i2c_call(unsigned int card, unsigned int cmd, void *arg)
 }
 
 static struct i2c_algo_bit_data bttv_i2c_algo_template = {
-	setsda:  bttv_bit_setsda,
-	setscl:  bttv_bit_setscl,
-	getsda:  bttv_bit_getsda,
-	getscl:  bttv_bit_getscl,
-	udelay:  16,
-	mdelay:  10,
-	timeout: 200,
+	.setsda  = bttv_bit_setsda,
+	.setscl  = bttv_bit_setscl,
+	.getsda  = bttv_bit_getsda,
+	.getscl  = bttv_bit_getscl,
+	.udelay  = 16,
+	.mdelay  = 10,
+	.timeout = 200,
 };
 
 static struct i2c_adapter bttv_i2c_adap_template = {
-	name:              "bt848",
-	id:                I2C_HW_B_BT848,
-	inc_use:           bttv_inc_use,
-	dec_use:           bttv_dec_use,
-	client_register:   attach_inform,
-	client_unregister: detach_inform,
+	.name              = "bt848",
+	.id                = I2C_HW_B_BT848,
+	.inc_use           = bttv_inc_use,
+	.dec_use           = bttv_dec_use,
+	.client_register   = attach_inform,
+	.client_unregister = detach_inform,
 };
 
 static struct i2c_client bttv_i2c_client_template = {
-        name: "bttv internal use only",
-        id:   -1,
+        .name = "bttv internal use only",
+        .id   = -1,
 };
 
 

drivers/media/video/bttv-vbi.c

@@ -123,10 +123,10 @@ static void vbi_buffer_release(struct file *file, struct videobuf_buffer *vb)
 }
 
 struct videobuf_queue_ops bttv_vbi_qops = {
-	buf_setup:    vbi_buffer_setup,
-	buf_prepare:  vbi_buffer_prepare,
-	buf_queue:    vbi_buffer_queue,
-	buf_release:  vbi_buffer_release,
+	.buf_setup    = vbi_buffer_setup,
+	.buf_prepare  = vbi_buffer_prepare,
+	.buf_queue    = vbi_buffer_queue,
+	.buf_release  = vbi_buffer_release,
 };
 
 /* ----------------------------------------------------------------------- */

drivers/media/video/bw-qcam.c

@@ -885,20 +885,20 @@ static int qcam_read(struct file *file, char *buf,
 }
  
 static struct file_operations qcam_fops = {
-	owner:		THIS_MODULE,
-	open:           video_exclusive_open,
-	release:        video_exclusive_release,
-	ioctl:          qcam_ioctl,
-	read:		qcam_read,
-	llseek:         no_llseek,
+	.owner		= THIS_MODULE,
+	.open           = video_exclusive_open,
+	.release        = video_exclusive_release,
+	.ioctl          = qcam_ioctl,
+	.read		= qcam_read,
+	.llseek         = no_llseek,
 };
 static struct video_device qcam_template=
 {
-	owner:		THIS_MODULE,
-	name:		"Connectix Quickcam",
-	type:		VID_TYPE_CAPTURE,
-	hardware:	VID_HARDWARE_QCAM_BW,
-	fops:           &qcam_fops,
+	.owner		= THIS_MODULE,
+	.name		= "Connectix Quickcam",
+	.type		= VID_TYPE_CAPTURE,
+	.hardware	= VID_HARDWARE_QCAM_BW,
+	.fops           = &qcam_fops,
 };
 
 #define MAX_CAMS 4

drivers/media/video/c-qcam.c

@@ -686,21 +686,21 @@ static int qcam_read(struct file *file, char *buf,
 
 /* video device template */
 static struct file_operations qcam_fops = {
-	owner:		THIS_MODULE,
-	open:           video_exclusive_open,
-	release:        video_exclusive_release,
-	ioctl:          qcam_ioctl,
-	read:		qcam_read,
-	llseek:         no_llseek,
+	.owner		= THIS_MODULE,
+	.open           = video_exclusive_open,
+	.release        = video_exclusive_release,
+	.ioctl          = qcam_ioctl,
+	.read		= qcam_read,
+	.llseek         = no_llseek,
 };
 
 static struct video_device qcam_template=
 {
-	owner:		THIS_MODULE,
-	name:		"Colour QuickCam",
-	type:		VID_TYPE_CAPTURE,
-	hardware:	VID_HARDWARE_QCAM_C,
-	fops:           &qcam_fops,
+	.owner		= THIS_MODULE,
+	.name		= "Colour QuickCam",
+	.type		= VID_TYPE_CAPTURE,
+	.hardware	= VID_HARDWARE_QCAM_C,
+	.fops           = &qcam_fops,
 };
 
 /* Initialize the QuickCam driver control structure. */

drivers/media/video/cpia.c

@@ -3783,21 +3783,21 @@ static int cpia_mmap(struct file *file, struct vm_area_struct *vma)
 }
 
 static struct file_operations cpia_fops = {
-	owner:		THIS_MODULE,
-	open:		cpia_open,
-	release:       	cpia_close,
-	read:		cpia_read,
-	mmap:		cpia_mmap,
-	ioctl:          cpia_ioctl,
-	llseek:         no_llseek,
+	.owner		= THIS_MODULE,
+	.open		= cpia_open,
+	.release       	= cpia_close,
+	.read		= cpia_read,
+	.mmap		= cpia_mmap,
+	.ioctl          = cpia_ioctl,
+	.llseek         = no_llseek,
 };
 
 static struct video_device cpia_template = {
-	owner:		THIS_MODULE,
-	name:		"CPiA Camera",
-	type:		VID_TYPE_CAPTURE,
-	hardware:	VID_HARDWARE_CPIA,
-	fops:           &cpia_fops,
+	.owner		= THIS_MODULE,
+	.name		= "CPiA Camera",
+	.type		= VID_TYPE_CAPTURE,
+	.hardware	= VID_HARDWARE_CPIA,
+	.fops           = &cpia_fops,
 };
 
 /* initialise cam_data structure  */

drivers/media/video/cpia_usb.c

@@ -582,10 +582,10 @@ MODULE_LICENSE("GPL");
 
 
 static struct usb_driver cpia_driver = {
-	name:		"cpia",
-	probe:		cpia_probe,
-	disconnect:	cpia_disconnect,
-	id_table:	cpia_id_table,
+	.name		= "cpia",
+	.probe		= cpia_probe,
+	.disconnect	= cpia_disconnect,
+	.id_table	= cpia_id_table,
 };
 
 /* don't use dev, it may be NULL! (see usb_cpia_cleanup) */

drivers/media/video/msp3400.c

@@ -1213,19 +1213,19 @@ static int msp_probe(struct i2c_adapter *adap);
 static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
 
 static struct i2c_driver driver = {
-        name:           "i2c msp3400 driver",
-        id:             I2C_DRIVERID_MSP3400,
-        flags:          I2C_DF_NOTIFY,
-        attach_adapter: msp_probe,
-        detach_client:  msp_detach,
-        command:        msp_command,
+	.name		= "i2cmsp3400driver",
+	.id		= I2C_DRIVERID_MSP3400,
+	.flags		= I2C_DF_NOTIFY,
+	.attach_adapter	= msp_probe,
+	.detach_client	= msp_detach,
+	.command	= msp_command,
 };
 
 static struct i2c_client client_template = 
 {
-	name:   "(unset)",
-	flags:  I2C_CLIENT_ALLOW_USE,
-        driver: &driver,
+	.name	= "(unset)",
+	.flags	= I2C_CLIENT_ALLOW_USE,
+	.driver	= &driver,
 };
 
 static int msp_attach(struct i2c_adapter *adap, int addr,

drivers/media/video/planb.c

@@ -2020,16 +2020,16 @@ static int planb_mmap(struct vm_area_struct *vma, struct video_device *dev, cons
 
 static struct video_device planb_template=
 {
-	owner:		THIS_MODULE,
-	name:		PLANB_DEVICE_NAME,
-	type:		VID_TYPE_OVERLAY,
-	hardware:	VID_HARDWARE_PLANB,
-	open:		planb_open,
-	close:		planb_close,
-	read:		planb_read,
-	write:		planb_write,
-	ioctl:		planb_ioctl,
-	mmap:		planb_mmap,	/* mmap? */
+	.owner		= THIS_MODULE,
+	.name		= PLANB_DEVICE_NAME,
+	.type		= VID_TYPE_OVERLAY,
+	.hardware	= VID_HARDWARE_PLANB,
+	.open		= planb_open,
+	.close		= planb_close,
+	.read		= planb_read,
+	.write		= planb_write,
+	.ioctl		= planb_ioctl,
+	.mmap		= planb_mmap,	/* mmap? */
 };
 
 static int init_planb(struct planb *pb)

drivers/media/video/pms.c

@@ -875,21 +875,21 @@ static int pms_read(struct file *file, char *buf,
 }
 
 static struct file_operations pms_fops = {
-	owner:		THIS_MODULE,
-	open:           video_exclusive_open,
-	release:        video_exclusive_release,
-	ioctl:          pms_ioctl,
-	read:           pms_read,
-	llseek:         no_llseek,
+	.owner		= THIS_MODULE,
+	.open           = video_exclusive_open,
+	.release        = video_exclusive_release,
+	.ioctl          = pms_ioctl,
+	.read           = pms_read,
+	.llseek         = no_llseek,
 };
 
 static struct video_device pms_template=
 {
-	owner:		THIS_MODULE,
-	name:		"Mediavision PMS",
-	type:		VID_TYPE_CAPTURE,
-	hardware:	VID_HARDWARE_PMS,
-	fops:           &pms_fops,
+	.owner		= THIS_MODULE,
+	.name		= "Mediavision PMS",
+	.type		= VID_TYPE_CAPTURE,
+	.hardware	= VID_HARDWARE_PMS,
+	.fops           = &pms_fops,
 };
 
 struct pms_device pms_device;

drivers/media/video/saa5249.c

@@ -678,20 +678,20 @@ module_init(init_saa_5249);
 module_exit(cleanup_saa_5249);
 
 static struct file_operations saa_fops = {
-	owner:		THIS_MODULE,
-	open:		saa5249_open,
-	release:       	saa5249_release,
-	ioctl:          saa5249_ioctl,
-	llseek:         no_llseek,
+	.owner		= THIS_MODULE,
+	.open		= saa5249_open,
+	.release       	= saa5249_release,
+	.ioctl          = saa5249_ioctl,
+	.llseek         = no_llseek,
 };
 
 static struct video_device saa_template =
 {
-	owner:		THIS_MODULE,
-	name:		IF_NAME,
-	type:		VID_TYPE_TELETEXT,	/*| VID_TYPE_TUNER ?? */
-	hardware:	VID_HARDWARE_SAA5249,
-	fops:           &saa_fops,
+	.owner		= THIS_MODULE,
+	.name		= IF_NAME,
+	.type		= VID_TYPE_TELETEXT,	/*| VID_TYPE_TUNER ?? */
+	.hardware	= VID_HARDWARE_SAA5249,
+	.fops           = &saa_fops,
 };
 
 MODULE_LICENSE("GPL");

drivers/media/video/stradis.c

@@ -1970,16 +1970,16 @@ static void saa_close(struct video_device *dev)
 /* template for video_device-structure */
 static struct video_device saa_template =
 {
-	owner:		THIS_MODULE,
-	name:		"SAA7146A",
-	type:		VID_TYPE_CAPTURE | VID_TYPE_OVERLAY,
-	hardware:	VID_HARDWARE_SAA7146,
-	open:		saa_open,
-	close:		saa_close,
-	read:		saa_read,
-	write:		saa_write,
-	ioctl:		saa_ioctl,
-	mmap:		saa_mmap,
+	.owner		= THIS_MODULE,
+	.name		= "SAA7146A",
+	.type		= VID_TYPE_CAPTURE | VID_TYPE_OVERLAY,
+	.hardware	= VID_HARDWARE_SAA7146,
+	.open		= saa_open,
+	.close		= saa_close,
+	.read		= saa_read,
+	.write		= saa_write,
+	.ioctl		= saa_ioctl,
+	.mmap		= saa_mmap,
 };
 
 static int configure_saa7146(struct pci_dev *dev, int num)

drivers/media/video/tuner.c

@@ -975,18 +975,18 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-        name:           "i2c TV tuner driver",
-        id:             I2C_DRIVERID_TUNER,
-        flags:          I2C_DF_NOTIFY,
-        attach_adapter: tuner_probe,
-        detach_client:  tuner_detach,
-        command:        tuner_command,
+	.name		= "i2cTVtunerdriver",
+	.id		= I2C_DRIVERID_TUNER,
+	.flags		= I2C_DF_NOTIFY,
+	.attach_adapter	= tuner_probe,
+	.detach_client	= tuner_detach,
+	.command	= tuner_command,
 };
-static struct i2c_client client_template =
+static structi2c_clientclient_template = 
 {
-        name:   "(tuner unset)",
-	flags:  I2C_CLIENT_ALLOW_USE,
-        driver: &driver,
+	.name	= "(tunerunset)",
+	.flags	= I2C_CLIENT_ALLOW_USE,
+	.driver	= &driver,
 };
 
 static int tuner_init_module(void)

drivers/media/video/tvaudio.c

@@ -1156,167 +1156,167 @@ MODULE_PARM(pic16c54,"i");
 
 static struct CHIPDESC chiplist[] = {
 	{
-		name:       "tda9840",
-		id:         I2C_DRIVERID_TDA9840,
-		insmodopt:  &tda9840,
-		addr_lo:    I2C_TDA9840 >> 1,
-		addr_hi:    I2C_TDA9840 >> 1,
-		registers:  5,
-
-		getmode:    tda9840_getmode,
-		setmode:    tda9840_setmode,
-		checkmode:  generic_checkmode,
-
-	        init:       { 2, { TDA9840_TEST, TDA9840_TEST_INT1SN
+		.name       = "tda9840",
+		.id         = I2C_DRIVERID_TDA9840,
+		.insmodopt  = &tda9840,
+		.addr_lo    = I2C_TDA9840 >> 1,
+		.addr_hi    = I2C_TDA9840 >> 1,
+		.registers  = 5,
+
+		.getmode    = tda9840_getmode,
+		.setmode    = tda9840_setmode,
+		.checkmode  = generic_checkmode,
+
+	        .init       = { 2, { TDA9840_TEST, TDA9840_TEST_INT1SN
 				/* ,TDA9840_SW, TDA9840_MONO */} }
 	},
 	{
-		name:       "tda9873h",
-		id:         I2C_DRIVERID_TDA9873,
-		checkit:    tda9873_checkit,
-		insmodopt:  &tda9873,
-		addr_lo:    I2C_TDA985x_L >> 1,
-		addr_hi:    I2C_TDA985x_H >> 1,
-		registers:  3,
-		flags:      CHIP_HAS_INPUTSEL,
-
-		getmode:    tda9873_getmode,
-		setmode:    tda9873_setmode,
-		checkmode:  generic_checkmode,
-
-		init:       { 4, { TDA9873_SW, 0xa4, 0x06, 0x03 } },
-		inputreg:   TDA9873_SW,
-		inputmute:  TDA9873_MUTE | TDA9873_AUTOMUTE,
-		inputmap:   {0xa0, 0xa2, 0xa0, 0xa0, 0xc0},
-		inputmask:  TDA9873_INP_MASK | TDA9873_MUTE | TDA9873_AUTOMUTE
+		.name       = "tda9873h",
+		.id         = I2C_DRIVERID_TDA9873,
+		.checkit    = tda9873_checkit,
+		.insmodopt  = &tda9873,
+		.addr_lo    = I2C_TDA985x_L >> 1,
+		.addr_hi    = I2C_TDA985x_H >> 1,
+		.registers  = 3,
+		.flags      = CHIP_HAS_INPUTSEL,
+
+		.getmode    = tda9873_getmode,
+		.setmode    = tda9873_setmode,
+		.checkmode  = generic_checkmode,
+
+		.init       = { 4, { TDA9873_SW, 0xa4, 0x06, 0x03 } },
+		.inputreg   = TDA9873_SW,
+		.inputmute  = TDA9873_MUTE | TDA9873_AUTOMUTE,
+		.inputmap   = {0xa0, 0xa2, 0xa0, 0xa0, 0xc0},
+		.inputmask  = TDA9873_INP_MASK | TDA9873_MUTE | TDA9873_AUTOMUTE
 		
 	},
 	{
-		name:       "tda9874h/a",
-		id:         I2C_DRIVERID_TDA9874,
-		checkit:    tda9874a_checkit,
-		initialize: tda9874a_initialize,
-		insmodopt:  &tda9874a,
-		addr_lo:    I2C_TDA9874 >> 1,
-		addr_hi:    I2C_TDA9874 >> 1,
-
-		getmode:    tda9874a_getmode,
-		setmode:    tda9874a_setmode,
-		checkmode:  generic_checkmode,
+		.name       = "tda9874h/a",
+		.id         = I2C_DRIVERID_TDA9874,
+		.checkit    = tda9874a_checkit,
+		.initialize = tda9874a_initialize,
+		.insmodopt  = &tda9874a,
+		.addr_lo    = I2C_TDA9874 >> 1,
+		.addr_hi    = I2C_TDA9874 >> 1,
+
+		.getmode    = tda9874a_getmode,
+		.setmode    = tda9874a_setmode,
+		.checkmode  = generic_checkmode,
 	},
 	{
-		name:       "tda9850",
-		id:         I2C_DRIVERID_TDA9850,
-		insmodopt:  &tda9850,
-		addr_lo:    I2C_TDA985x_L >> 1,
-		addr_hi:    I2C_TDA985x_H >> 1,
-		registers:  11,
+		.name       = "tda9850",
+		.id         = I2C_DRIVERID_TDA9850,
+		.insmodopt  = &tda9850,
+		.addr_lo    = I2C_TDA985x_L >> 1,
+		.addr_hi    = I2C_TDA985x_H >> 1,
+		.registers  = 11,
 
-		getmode:    tda985x_getmode,
-		setmode:    tda985x_setmode,
+		.getmode    = tda985x_getmode,
+		.setmode    = tda985x_setmode,
 
-		init:       { 8, { TDA9850_C4, 0x08, 0x08, TDA985x_STEREO, 0x07, 0x10, 0x10, 0x03 } }
+		.init       = { 8, { TDA9850_C4, 0x08, 0x08, TDA985x_STEREO, 0x07, 0x10, 0x10, 0x03 } }
 	},
 	{
-		name:       "tda9855",
-		id:         I2C_DRIVERID_TDA9855,
-		insmodopt:  &tda9855,
-		addr_lo:    I2C_TDA985x_L >> 1,
-		addr_hi:    I2C_TDA985x_H >> 1,
-		registers:  11,
-		flags:      CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE,
-
-		leftreg:    TDA9855_VL,
-		rightreg:   TDA9855_VR,
-		bassreg:    TDA9855_BA,
-		treblereg:  TDA9855_TR,
-		volfunc:    tda9855_volume,
-		bassfunc:   tda9855_bass,
-		treblefunc: tda9855_treble,
-
-		getmode:    tda985x_getmode,
-		setmode:    tda985x_setmode,
-
-		init:       { 12, { 0, 0x6f, 0x6f, 0x0e, 0x07<<1, 0x8<<2,
+		.name       = "tda9855",
+		.id         = I2C_DRIVERID_TDA9855,
+		.insmodopt  = &tda9855,
+		.addr_lo    = I2C_TDA985x_L >> 1,
+		.addr_hi    = I2C_TDA985x_H >> 1,
+		.registers  = 11,
+		.flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE,
+
+		.leftreg    = TDA9855_VL,
+		.rightreg   = TDA9855_VR,
+		.bassreg    = TDA9855_BA,
+		.treblereg  = TDA9855_TR,
+		.volfunc    = tda9855_volume,
+		.bassfunc   = tda9855_bass,
+		.treblefunc = tda9855_treble,
+
+		.getmode    = tda985x_getmode,
+		.setmode    = tda985x_setmode,
+
+		.init       = { 12, { 0, 0x6f, 0x6f, 0x0e, 0x07<<1, 0x8<<2,
 				    TDA9855_MUTE | TDA9855_AVL | TDA9855_LOUD | TDA9855_INT,
 				    TDA985x_STEREO | TDA9855_LINEAR | TDA9855_TZCM | TDA9855_VZCM,
 				    0x07, 0x10, 0x10, 0x03 }}
 	},
 	{
-		name:       "tea6300",
-		id:         I2C_DRIVERID_TEA6300,
-		insmodopt:  &tea6300,
-		addr_lo:    I2C_TEA6300 >> 1,
-		addr_hi:    I2C_TEA6300 >> 1,
-		registers:  6,
-		flags:      CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
-
-		leftreg:    TEA6300_VR,
-		rightreg:   TEA6300_VL,
-		bassreg:    TEA6300_BA,
-		treblereg:  TEA6300_TR,
-		volfunc:    tea6300_shift10,
-		bassfunc:   tea6300_shift12,
-		treblefunc: tea6300_shift12,
-
-		inputreg:   TEA6300_S,
-		inputmap:   { TEA6300_S_SA, TEA6300_S_SB, TEA6300_S_SC },
-		inputmute:  TEA6300_S_GMU,
+		.name       = "tea6300",
+		.id         = I2C_DRIVERID_TEA6300,
+		.insmodopt  = &tea6300,
+		.addr_lo    = I2C_TEA6300 >> 1,
+		.addr_hi    = I2C_TEA6300 >> 1,
+		.registers  = 6,
+		.flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
+
+		.leftreg    = TEA6300_VR,
+		.rightreg   = TEA6300_VL,
+		.bassreg    = TEA6300_BA,
+		.treblereg  = TEA6300_TR,
+		.volfunc    = tea6300_shift10,
+		.bassfunc   = tea6300_shift12,
+		.treblefunc = tea6300_shift12,
+
+		.inputreg   = TEA6300_S,
+		.inputmap   = { TEA6300_S_SA, TEA6300_S_SB, TEA6300_S_SC },
+		.inputmute  = TEA6300_S_GMU,
 	},
 	{
-		name:       "tea6420",
-		id:         I2C_DRIVERID_TEA6420,
-		insmodopt:  &tea6420,
-		addr_lo:    I2C_TEA6420 >> 1,
-		addr_hi:    I2C_TEA6420 >> 1,
-		registers:  1,
-		flags:      CHIP_HAS_INPUTSEL,
-
-		inputreg:   -1,
-		inputmap:   { TEA6420_S_SA, TEA6420_S_SB, TEA6420_S_SC },
-		inputmute:  TEA6300_S_GMU,
+		.name       = "tea6420",
+		.id         = I2C_DRIVERID_TEA6420,
+		.insmodopt  = &tea6420,
+		.addr_lo    = I2C_TEA6420 >> 1,
+		.addr_hi    = I2C_TEA6420 >> 1,
+		.registers  = 1,
+		.flags      = CHIP_HAS_INPUTSEL,
+
+		.inputreg   = -1,
+		.inputmap   = { TEA6420_S_SA, TEA6420_S_SB, TEA6420_S_SC },
+		.inputmute  = TEA6300_S_GMU,
 	},
 	{
-		name:       "tda8425",
-		id:         I2C_DRIVERID_TDA8425,
-		insmodopt:  &tda8425,
-		addr_lo:    I2C_TDA8425 >> 1,
-		addr_hi:    I2C_TDA8425 >> 1,
-		registers:  9,
-		flags:      CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
-
-		leftreg:    TDA8425_VR,
-		rightreg:   TDA8425_VL,
-		bassreg:    TDA8425_BA,
-		treblereg:  TDA8425_TR,
-		volfunc:    tda8425_shift10,
-		bassfunc:   tda8425_shift12,
-		treblefunc: tda8425_shift12,
-
-		inputreg:   TDA8425_S1,
-		inputmap:   { TDA8425_S1_CH1, TDA8425_S1_CH1, TDA8425_S1_CH1 },
-		inputmute:  TDA8425_S1_OFF,
-
-		setmode:    tda8425_setmode,
+		.name       = "tda8425",
+		.id         = I2C_DRIVERID_TDA8425,
+		.insmodopt  = &tda8425,
+		.addr_lo    = I2C_TDA8425 >> 1,
+		.addr_hi    = I2C_TDA8425 >> 1,
+		.registers  = 9,
+		.flags      = CHIP_HAS_VOLUME | CHIP_HAS_BASSTREBLE | CHIP_HAS_INPUTSEL,
+
+		.leftreg    = TDA8425_VR,
+		.rightreg   = TDA8425_VL,
+		.bassreg    = TDA8425_BA,
+		.treblereg  = TDA8425_TR,
+		.volfunc    = tda8425_shift10,
+		.bassfunc   = tda8425_shift12,
+		.treblefunc = tda8425_shift12,
+
+		.inputreg   = TDA8425_S1,
+		.inputmap   = { TDA8425_S1_CH1, TDA8425_S1_CH1, TDA8425_S1_CH1 },
+		.inputmute  = TDA8425_S1_OFF,
+
+		.setmode    = tda8425_setmode,
 	},
 	{
-		name:       "pic16c54 (PV951)",
-		id:         I2C_DRIVERID_PIC16C54_PV951,
-		insmodopt:  &pic16c54,
-		addr_lo:    I2C_PIC16C54 >> 1,
-		addr_hi:    I2C_PIC16C54>> 1,
-		registers:  2,
-		flags:      CHIP_HAS_INPUTSEL,
-
-		inputreg:   PIC16C54_REG_MISC,
-		inputmap:   {PIC16C54_MISC_SND_NOTMUTE|PIC16C54_MISC_SWITCH_TUNER,
+		.name       = "pic16c54 (PV951)",
+		.id         = I2C_DRIVERID_PIC16C54_PV951,
+		.insmodopt  = &pic16c54,
+		.addr_lo    = I2C_PIC16C54 >> 1,
+		.addr_hi    = I2C_PIC16C54>> 1,
+		.registers  = 2,
+		.flags      = CHIP_HAS_INPUTSEL,
+
+		.inputreg   = PIC16C54_REG_MISC,
+		.inputmap   = {PIC16C54_MISC_SND_NOTMUTE|PIC16C54_MISC_SWITCH_TUNER,
 			     PIC16C54_MISC_SND_NOTMUTE|PIC16C54_MISC_SWITCH_LINE,
 			     PIC16C54_MISC_SND_NOTMUTE|PIC16C54_MISC_SWITCH_LINE,
 			     PIC16C54_MISC_SND_MUTE,PIC16C54_MISC_SND_MUTE,
 			     PIC16C54_MISC_SND_NOTMUTE},
-		inputmute:  PIC16C54_MISC_SND_MUTE,
+		.inputmute  = PIC16C54_MISC_SND_MUTE,
 	},
-	{ name: NULL } /* EOF */
+	{ .name = NULL } /* EOF */
 };
 
 
@@ -1544,19 +1544,19 @@ static int chip_command(struct i2c_client *client,
 
 
 static struct i2c_driver driver = {
-        name:            "generic i2c audio driver",
-        id:              I2C_DRIVERID_TVAUDIO,
-        flags:           I2C_DF_NOTIFY,
-        attach_adapter:  chip_probe,
-        detach_client:   chip_detach,
-        command:         chip_command,
+	.name		= "generic i2c audio driver",
+	.id		= I2C_DRIVERID_TVAUDIO,
+	.flags		= I2C_DF_NOTIFY,
+	.attach_adapter	= chip_probe,
+	.detach_client	= chip_detach,
+	.command	= chip_command,
 };
 
 static struct i2c_client client_template =
 {
-        name:   "(unset)",
-	flags:  I2C_CLIENT_ALLOW_USE,
-        driver: &driver,
+	.name		= "(unset)",
+	.flags		= I2C_CLIENT_ALLOW_USE,
+	.driver		= &driver,
 };
 
 static int audiochip_init_module(void)

drivers/media/video/tvmixer.c

@@ -217,19 +217,19 @@ static int tvmixer_release(struct inode *inode, struct file *file)
 
 
 static struct i2c_driver driver = {
-	name:            "tv card mixer driver",
-        id:              I2C_DRIVERID_TVMIXER,
-	flags:           I2C_DF_DUMMY,
-        attach_adapter:  tvmixer_adapters,
-        detach_client:   tvmixer_clients,
+	.name		= "tv card mixer driver",
+	.id		= I2C_DRIVERID_TVMIXER,
+	.flags		= I2C_DF_DUMMY,
+	.attach_adapter	= tvmixer_adapters,
+	.detach_client	= tvmixer_clients,
 };
 
 static struct file_operations tvmixer_fops = {
-	owner:		THIS_MODULE,
-	llseek:         no_llseek,
-	ioctl:          tvmixer_ioctl,
-	open:           tvmixer_open,
-	release:        tvmixer_release,
+	.owner		= THIS_MODULE,
+	.llseek		= no_llseek,
+	.ioctl		= tvmixer_ioctl,
+	.open		= tvmixer_open,
+	.release	= tvmixer_release,
 };
 
 /* ----------------------------------------------------------------------- */

drivers/media/video/video-buf.c

@@ -926,9 +926,9 @@ videobuf_vm_nopage(struct vm_area_struct *vma, unsigned long vaddr,
 
 static struct vm_operations_struct videobuf_vm_ops =
 {
-	open:     videobuf_vm_open,
-	close:    videobuf_vm_close,
-	nopage:   videobuf_vm_nopage,
+	.open     = videobuf_vm_open,
+	.close    = videobuf_vm_close,
+	.nopage   = videobuf_vm_nopage,
 };
 
 int videobuf_mmap_setup(struct file *file, struct videobuf_queue *q,

drivers/media/video/videodev.c

@@ -472,9 +472,9 @@ void video_unregister_device(struct video_device *vfd)
 
 static struct file_operations video_fops=
 {
-	owner:		THIS_MODULE,
-	llseek:		no_llseek,
-	open:		video_open,
+	.owner		= THIS_MODULE,
+	.llseek		= no_llseek,
+	.open		= video_open,
 };
 
 /*

drivers/media/video/vino.c

@@ -222,14 +222,14 @@ static int vino_mmap(struct video_device *dev, const char *adr,
 }
 
 static struct video_device vino_dev = {
-	owner:		THIS_MODULE,
-	name:		"Vino IndyCam/TV",
-	type:		VID_TYPE_CAPTURE,
-	hardware:	VID_HARDWARE_VINO,
-	open:		vino_open,
-	close:		vino_close,
-	ioctl:		vino_ioctl,
-	mmap:		vino_mmap,
+	.owner		= THIS_MODULE,
+	.name		= "Vino IndyCam/TV",
+	.type		= VID_TYPE_CAPTURE,
+	.hardware	= VID_HARDWARE_VINO,
+	.open		= vino_open,
+	.close		= vino_close,
+	.ioctl		= vino_ioctl,
+	.mmap		= vino_mmap,
 };
 
 int __init init_vino(struct video_device *dev)

drivers/media/video/w9966.c

@@ -179,19 +179,19 @@ static int w9966_v4l_read(struct file *file, char *buf,
 			  size_t count, loff_t *ppos);
 
 static struct file_operations w9966_fops = {
-	owner:		THIS_MODULE,
-	open:           video_exclusive_open,
-	release:        video_exclusive_release,
-	ioctl:          w9966_v4l_ioctl,
-	read:           w9966_v4l_read,
-	llseek:         no_llseek,
+	.owner		= THIS_MODULE,
+	.open           = video_exclusive_open,
+	.release        = video_exclusive_release,
+	.ioctl          = w9966_v4l_ioctl,
+	.read           = w9966_v4l_read,
+	.llseek         = no_llseek,
 };
 static struct video_device w9966_template = {
-	owner:		THIS_MODULE,
-	name:           W9966_DRIVERNAME,
-	type:           VID_TYPE_CAPTURE | VID_TYPE_SCALES,
-	hardware:       VID_HARDWARE_W9966,
-	fops:           &w9966_fops,
+	.owner		= THIS_MODULE,
+	.name           = W9966_DRIVERNAME,
+	.type           = VID_TYPE_CAPTURE | VID_TYPE_SCALES,
+	.hardware       = VID_HARDWARE_W9966,
+	.fops           = &w9966_fops,
 };
 
 /*
@@ -710,14 +710,13 @@ static int w9966_v4l_do_ioctl(struct inode *inode, struct file *file,
 	case VIDIOCGCAP:
 	{
 		static struct video_capability vcap = {
-			name:      W9966_DRIVERNAME,
-			type:      VID_TYPE_CAPTURE | VID_TYPE_SCALES,
-			channels:  1,
-			audios:    0,
-			maxwidth:  W9966_WND_MAX_W,
-			maxheight: W9966_WND_MAX_H,
-			minwidth:  2,
-			minheight: 1,
+			.name      = W9966_DRIVERNAME,
+			.type      = VID_TYPE_CAPTURE | VID_TYPE_SCALES,
+			.channels  = 1,
+			.maxwidth  = W9966_WND_MAX_W,
+			.maxheight = W9966_WND_MAX_H,
+			.minwidth  = 2,
+			.minheight = 1,
 		};
 		struct video_capability *cap = arg;
 		*cap = vcap;

drivers/media/video/zr36067.c

@@ -4396,18 +4396,18 @@ static int zoran_init_done(struct video_device *dev)
 }
 
 static struct video_device zoran_template = {
-	owner:		THIS_MODULE,
-	name:		ZORAN_NAME,
-	type:		VID_TYPE_CAPTURE | VID_TYPE_OVERLAY | VID_TYPE_CLIPPING |
+	.owner		= THIS_MODULE,
+	.name		= ZORAN_NAME,
+	.type		= VID_TYPE_CAPTURE | VID_TYPE_OVERLAY | VID_TYPE_CLIPPING |
 	    VID_TYPE_FRAMERAM | VID_TYPE_SCALES | VID_TYPE_SUBCAPTURE,
-	hardware:	ZORAN_HARDWARE,
-	open:		zoran_open,
-	close:		zoran_close,
-	read:		zoran_read,
-	write:		zoran_write,
-	ioctl:		zoran_ioctl,
-	mmap:		zoran_mmap,
-	initialize:	zoran_init_done,
+	.hardware	= ZORAN_HARDWARE,
+	.open		= zoran_open,
+	.close		= zoran_close,
+	.read		= zoran_read,
+	.write		= zoran_write,
+	.ioctl		= zoran_ioctl,
+	.mmap		= zoran_mmap,
+	.initialize	= zoran_init_done,
 };
 
 /*

drivers/media/video/zr36120.c

@@ -1490,18 +1490,18 @@ int zoran_mmap(struct vm_area_struct *vma, struct video_device* dev, const char*
 
 static struct video_device zr36120_template=
 {
-	owner:		THIS_MODULE,
-	name:		"UNSET",
-	type:		VID_TYPE_TUNER|VID_TYPE_CAPTURE|VID_TYPE_OVERLAY,
-	hardware:	VID_HARDWARE_ZR36120,
-	open:		zoran_open,
-	close:		zoran_close,
-	read:		zoran_read,
-	write:		zoran_write,
-	poll:		zoran_poll,
-	ioctl:		zoran_ioctl,
-	mmap:		zoran_mmap,
-	minor:		-1,
+	.owner		= THIS_MODULE,
+	.name		= "UNSET",
+	.type		= VID_TYPE_TUNER|VID_TYPE_CAPTURE|VID_TYPE_OVERLAY,
+	.hardware	= VID_HARDWARE_ZR36120,
+	.open		= zoran_open,
+	.close		= zoran_close,
+	.read		= zoran_read,
+	.write		= zoran_write,
+	.poll		= zoran_poll,
+	.ioctl		= zoran_ioctl,
+	.mmap		= zoran_mmap,
+	.minor		= -1,
 };
 
 static
@@ -1826,17 +1826,17 @@ int vbi_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
 
 static struct video_device vbi_template=
 {
-	owner:		THIS_MODULE,
-	name:		"UNSET",
-	type:		VID_TYPE_CAPTURE|VID_TYPE_TELETEXT,
-	hardware:	VID_HARDWARE_ZR36120,
-	open:		vbi_open,
-	close:		vbi_close,
-	read:		vbi_read,
-	write:		zoran_write,
-	poll:		vbi_poll,
-	ioctl:		vbi_ioctl,
-	minor:		-1,
+	.owner		= THIS_MODULE,
+	.name		= "UNSET",
+	.type		= VID_TYPE_CAPTURE|VID_TYPE_TELETEXT,
+	.hardware	= VID_HARDWARE_ZR36120,
+	.open		= vbi_open,
+	.close		= vbi_close,
+	.read		= vbi_read,
+	.write		= zoran_write,
+	.poll		= vbi_poll,
+	.ioctl		= vbi_ioctl,
+	.minor		= -1,
 };
 
 /*