1 files changed, 25 insertions, 34 deletions

diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index 0c9a04a1f..e9126e36c 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -4532,6 +4532,7 @@ int av7110_attach (struct saa7146_dev* dev)
 	av7110_setup_irc_config (av7110, 0);
         dvb_register(av7110);
 	
+	printk(KERN_INFO "av7110: found av7110-%d.\n",av7110_num);
 	av7110_num++;
         return 0;
 
@@ -4620,42 +4621,38 @@ struct saa7146_standard standard[] = {
 /* fixme: more to come here */
 };
 
-
 static
 struct saa7146_extension av7110_extension = {
-	"dvb\0",
-	1,	/* inputs */
-	1,	/* audios */
-	0,	/* additional capabilities: none */
-	
-	&sub_data[0],
+	.name		= "dvb\0",
+	.inputs		= 1,
+	.audios 	= 1,
+	.capabilities	= 0,
 
-	THIS_MODULE,
+	.devices	= &sub_data[0],
+	.module		= THIS_MODULE,
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	av7110_inc_use,
-	av7110_dec_use,
+	.inc_use	= av7110_inc_use,
+	.dec_use	= av7110_dec_use,
 #endif
 	
-	&standard[0],
-	sizeof(standard)/sizeof(struct saa7146_standard),
-	NULL, 
+	.stds		= &standard[0],
+	.num_stds	= sizeof(standard)/sizeof(struct saa7146_standard),
+	.std_callback	= NULL, 
 	
-	0,	/* don't use kernel i2c */
-	NULL,	/* don't provide vbi, no bypass */
+	.use_kernel_i2c	= 0,
+	.vbi		= NULL,
 	
-	&ioctls[0],
+	.ioctls		= &ioctls[0],
 	
-	av7110_preinit,
-	av7110_probe,
-
-	av7110_attach,
-	av7110_detach,
-
-	av7110_ioctl,
-
-	MASK_07|MASK_10|MASK_19|MASK_03|MASK_27,
-	av7110_irq,
+	.preinit	= av7110_preinit,
+	.probe		= av7110_probe,
+	.attach		= av7110_attach,
+	.detach		= av7110_detach,
+	.ioctl		= av7110_ioctl,
+
+	.irq_mask	= MASK_07|MASK_10|MASK_19|MASK_03|MASK_27,
+	.irq_func	= av7110_irq,
 };	
 
 int __init av7110_init(void) 
@@ -4665,14 +4662,8 @@ int __init av7110_init(void)
 	if( 0 != saa7146_register_extension(&av7110_extension)) {
 		return -ENODEV;
 	}
-
-	if( 0 == av7110_num ) {
-		printk(KERN_ERR "no av7110(s) found.\n");
-		return -ENODEV;
-	}
-
-	printk(KERN_INFO "%d av7110(s) found.\n", av7110_num);
-        return result;
+	
+	return 0;
 }
 
 void __exit av7110_exit(void)