C99 fixes

5 files changed, 93 insertions, 107 deletions

diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index 32613db23..fa9c3671f 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -3124,24 +3124,24 @@ static unsigned int dvb_audio_poll(struct file *file, poll_table *wait)
 
 
 static struct file_operations dvb_fops = {
-	ioctl:         dvb_ioctl,
-	mmap:          dvb_mmap,
-	llseek:        no_llseek    
+	.ioctl		= dvb_ioctl,
+	.mmap		= dvb_mmap,
+	.llseek		= no_llseek    
 };
 
 
 /* template for video_device-structure */
 static struct video_device dvb_template = {
-	owner:		THIS_MODULE,
-	name:	        "DVB Board",
-	type:	        VID_TYPE_TUNER		|
-        	        VID_TYPE_CAPTURE	|
-	                VID_TYPE_OVERLAY	|
-        	        VID_TYPE_CLIPPING	|
-                	VID_TYPE_FRAMERAM	|
-	                VID_TYPE_SCALES,
-	hardware:       VID_HARDWARE_SAA7146,
-	fops:		&dvb_fops
+	.owner		= THIS_MODULE,
+	.name		= "DVB Board",
+	.type		= VID_TYPE_TUNER	|
+			  VID_TYPE_CAPTURE	|
+			  VID_TYPE_OVERLAY	|
+			  VID_TYPE_CLIPPING	|
+			  VID_TYPE_FRAMERAM	|
+			  VID_TYPE_SCALES,
+	.hardware	= VID_HARDWARE_SAA7146,
+	.fops		= &dvb_fops
 };
 
 
@@ -4256,75 +4256,70 @@ static int dvb_audio_release(struct inode *inode, struct file *file)
  ******************************************************************************/
 
 static struct file_operations dvb_video_fops = {
-	owner:		THIS_MODULE,
-        read:		0,
-	write:		dvb_video_write,
-	ioctl:		dvb_generic_ioctl,
-	open:		dvb_video_open,
-	release:	dvb_video_release,
-	poll:		dvb_video_poll,
+	.owner		= THIS_MODULE,
+	.write		= dvb_video_write,
+	.ioctl		= dvb_generic_ioctl,
+	.open		= dvb_video_open,
+	.release	= dvb_video_release,
+	.poll		= dvb_video_poll,
 };
 
 static dvb_device_t dvbdev_video = {
-        priv: 0,
-        users: 1,
-        writers: 1,
-        fops: &dvb_video_fops,
-        kernel_ioctl: dvb_video_ioctl,
+	.priv		= 0,
+	.users		= 1,
+	.writers	= 1,
+	.fops		= &dvb_video_fops,
+	.kernel_ioctl	= dvb_video_ioctl,
 };
 
 static struct file_operations dvb_audio_fops = {
-	owner:		THIS_MODULE,
-        read:		0,
-	write:		dvb_audio_write,
-	ioctl:		dvb_generic_ioctl,
-	open:		dvb_audio_open,
-	release:	dvb_audio_release,
-	poll:		dvb_audio_poll,
+	.owner		= THIS_MODULE,
+	.write		= dvb_audio_write,
+	.ioctl		= dvb_generic_ioctl,
+	.open		= dvb_audio_open,
+	.release	= dvb_audio_release,
+	.poll		= dvb_audio_poll,
 };
 
 static dvb_device_t dvbdev_audio = {
-        priv: 0,
-        users: 1,
-        writers: 1,
-        fops: &dvb_audio_fops,
-        kernel_ioctl: dvb_audio_ioctl,
+	.priv		= 0,
+	.users		= 1,
+	.writers	= 1,
+	.fops		= &dvb_audio_fops,
+	.kernel_ioctl	= dvb_audio_ioctl,
 };
 
 static struct file_operations dvb_ca_fops = {
-	owner:		THIS_MODULE,
-        read:		dvb_ca_read,
-	write:		dvb_ca_write,
-	ioctl:		dvb_generic_ioctl,
-	open:		dvb_ca_open,
-	release:	dvb_generic_release,
-	poll:		dvb_ca_poll,
+	.owner		= THIS_MODULE,
+	.read		= dvb_ca_read,
+	.write		= dvb_ca_write,
+	.ioctl		= dvb_generic_ioctl,
+	.open		= dvb_ca_open,
+	.release	= dvb_generic_release,
+	.poll		= dvb_ca_poll,
 };
 
 static dvb_device_t dvbdev_ca = {
-        priv: 0,
-        users: 1,
-        writers: 1,
-        fops: &dvb_ca_fops,
-        kernel_ioctl: dvb_ca_ioctl,
+	.priv		= 0,
+	.users		= 1,
+	.writers	= 1,
+	.fops		= &dvb_ca_fops,
+	.kernel_ioctl	= dvb_ca_ioctl,
 };
 
 static struct file_operations dvb_osd_fops = {
-	owner:		THIS_MODULE,
-        read:		0,
-	write:		0,
-	ioctl:		dvb_generic_ioctl,
-	open:		dvb_generic_open,
-	release:	dvb_generic_release,
-	poll:		0,
+	.owner		= THIS_MODULE,
+	.ioctl		= dvb_generic_ioctl,
+	.open		= dvb_generic_open,
+	.release	= dvb_generic_release,
 };
 
 static dvb_device_t dvbdev_osd = {
-        priv: 0,
-        users: 1,
-        writers: 1,
-        fops: &dvb_osd_fops,
-        kernel_ioctl: dvb_osd_ioctl,
+	.priv		= 0,
+	.users		= 1,
+	.writers	= 1,
+	.fops		= &dvb_osd_fops,
+	.kernel_ioctl	= dvb_osd_ioctl,
 };
 
 
diff --git a/linux/drivers/media/dvb/dvb-core/dmxdev.c b/linux/drivers/media/dvb/dvb-core/dmxdev.c
index d388a1b62..b92f31d54 100644
--- a/linux/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dmxdev.c
@@ -965,20 +965,19 @@ static int dvb_demux_release(struct inode *inode, struct file *file)
 }
 
 static struct file_operations dvb_demux_fops = {
-	owner:		THIS_MODULE,
-        read:		dvb_demux_read,
-	write:		0,
-	ioctl:		dvb_demux_ioctl,
-	open:		dvb_demux_open,
-	release:	dvb_demux_release,
-	poll:		dvb_demux_poll,
+	.owner		= THIS_MODULE,
+	.read		= dvb_demux_read,
+	.ioctl		= dvb_demux_ioctl,
+	.open		= dvb_demux_open,
+	.release	= dvb_demux_release,
+	.poll		= dvb_demux_poll,
 };
 
 static dvb_device_t dvbdev_demux = {
-        priv: 0,
-        users: 1,
-        writers: 1,
-        fops: &dvb_demux_fops
+	.priv		= 0,
+	.users		= 1,
+	.writers	= 1,
+	.fops		= &dvb_demux_fops
 };
 
 static int dvb_dvr_do_ioctl(struct inode *inode, struct file *file,
@@ -1040,20 +1039,20 @@ static unsigned int dvb_dvr_poll(struct file *file, poll_table *wait)
 }
 
 static struct file_operations dvb_dvr_fops = {
-	owner:		THIS_MODULE,
-        read:		dvb_dvr_read,
-	write:		dvb_dvr_write,
-	ioctl:		dvb_dvr_ioctl,
-	open:		dvb_dvr_open,
-	release:	dvb_dvr_release,
-	poll:		dvb_dvr_poll,
+	.owner		= THIS_MODULE,
+	.read		= dvb_dvr_read,
+	.write		= dvb_dvr_write,
+	.ioctl		= dvb_dvr_ioctl,
+	.open		= dvb_dvr_open,
+	.release	= dvb_dvr_release,
+	.poll		=dvb_dvr_poll,
 };
 
 static dvb_device_t dvbdev_dvr = {
-        priv: 0,
-        users: 1,
-        writers: 1,
-        fops: &dvb_dvr_fops
+	.priv		= 0,
+	.users		= 1,
+	.writers	= 1,
+	.fops		= &dvb_dvr_fops
 };
 
 int 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index f64279a04..7e14f56d9 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -827,11 +827,11 @@ dvb_remove_frontend_notifier (struct dvb_adapter_s *adapter,
 
 static
 struct file_operations dvb_frontend_fops = {
-        owner:          THIS_MODULE,
-        ioctl:          dvb_generic_ioctl,
-	poll:		dvb_frontend_poll,
-        open:           dvb_frontend_open,
-        release:        dvb_frontend_release
+	.owner		= THIS_MODULE,
+	.ioctl		= dvb_generic_ioctl,
+	.poll		= dvb_frontend_poll,
+	.open		= dvb_frontend_open,
+	.release	= dvb_frontend_release
 };
 
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_net.c b/linux/drivers/media/dvb/dvb-core/dvb_net.c
index 6553682a8..35a18d3ae 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_net.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_net.c
@@ -462,21 +462,18 @@ int dvb_net_ioctl(struct inode *inode, struct file *file,
 }
 
 static struct file_operations dvb_net_fops = {
-	owner:		THIS_MODULE,
-        read:		0,
-	write:		0,
-	ioctl:		dvb_generic_ioctl,
-	open:		dvb_generic_open,
-	release:	dvb_generic_release,
-	poll:		0,
+	.owner		= THIS_MODULE,
+	.ioctl		= dvb_generic_ioctl,
+	.open		= dvb_generic_open,
+	.release	= dvb_generic_release,
 };
 
 static dvb_device_t dvbdev_net = {
-        priv: 0,
-        users: 1,
-        writers: 1,
-        fops: &dvb_net_fops,
-        kernel_ioctl: dvb_net_ioctl,
+	.priv		= 0,
+	.users		= 1,
+	.writers	= 1,
+	.fops		= &dvb_net_fops,
+	.kernel_ioctl	= dvb_net_ioctl,
 };
 
 void
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index b38cfdc6a..a8c7591c7 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -118,13 +118,8 @@ int dvb_device_open(struct inode *inode, struct file *file)
 
 static struct file_operations dvb_device_fops =
 {
-	owner:		THIS_MODULE,
-        read:		NULL,
-	write:		NULL,
-	ioctl:		NULL,
-	open:		dvb_device_open,
-	release:	NULL,
-	poll:		NULL,
+	.owner =	THIS_MODULE,
+	.open =		dvb_device_open,
 };
 #endif /* CONFIG_DVB_DEVFS_ONLY */