diff -ru usbvision-0.3.3-test5-orig/src/bt819-new.c usbvision-0.3.3-test5-i2c/src/bt819-new.c
--- usbvision-0.3.3-test5-orig/src/bt819-new.c	Wed Oct  2 02:39:07 2002
+++ usbvision-0.3.3-test5-i2c/src/bt819-new.c	Thu Jul 31 10:03:18 2003
@@ -558,12 +558,13 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-	"i2c bt819 driver",		/* name */
-	I2C_DRIVERID_BT819,	/* ID */
-	I2C_DF_NOTIFY, 
-	bt819_probe,
-	bt819_detach,
-	bt819_command
+	.owner          = THIS_MODULE,
+	.name           = "i2c bt819 driver",
+	.id             = I2C_DRIVERID_BT819,
+	.flags          = I2C_DF_NOTIFY, 
+	.attach_adapter = bt819_probe,
+	.detach_client  = bt819_detach,
+	.command        = bt819_command
 };
 
 static struct i2c_client client_template = {
diff -ru usbvision-0.3.3-test5-orig/src/i2c-algo-usb.c usbvision-0.3.3-test5-i2c/src/i2c-algo-usb.c
--- usbvision-0.3.3-test5-orig/src/i2c-algo-usb.c	Thu Jun  5 11:34:26 2003
+++ usbvision-0.3.3-test5-i2c/src/i2c-algo-usb.c	Mon Aug  4 14:04:35 2003
@@ -182,14 +182,15 @@
 /* -----exported algorithm data: -------------------------------------	*/
 
 static struct i2c_algorithm i2c_usb_algo = {
-	"USB algorithm",
-	I2C_ALGO_BIT,		/* FIXME */
-	usb_xfer,
-	NULL,
-	NULL,			/* slave_xmit           */
-	NULL,			/* slave_recv           */
-	algo_control,		/* ioctl                */
-	usb_func,		/* functionality        */
+	.owner         = THIS_MODULE,
+	.name          = "USB algorithm",
+	.id            = I2C_ALGO_BIT, /* FIXME */
+	.master_xfer   = usb_xfer,
+	.smbus_xfer    = NULL,
+	.slave_send    = NULL,
+	.slave_recv    = NULL,
+	.algo_control  = algo_control,
+	.functionality = usb_func,
 };
 
 /* 
diff -ru usbvision-0.3.3-test5-orig/src/saa7111-new.c usbvision-0.3.3-test5-i2c/src/saa7111-new.c
--- usbvision-0.3.3-test5-orig/src/saa7111-new.c	Sat Oct 12 09:11:50 2002
+++ usbvision-0.3.3-test5-i2c/src/saa7111-new.c	Thu Jul 31 10:05:47 2003
@@ -459,12 +459,13 @@
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver saa7111_driver = {
-	"SAA7111",
-	I2C_DRIVERID_SAA7111A,	/* ????? */
-	I2C_DF_NOTIFY,
-	saa7111_probe,
-	saa7111_detach,
-	saa7111_command,
+	.owner          = THIS_MODULE,
+	.name           = "SAA7111",
+	.id             = I2C_DRIVERID_SAA7111A, /* ????? */
+	.flags          = I2C_DF_NOTIFY,
+	.attach_adapter = saa7111_probe,
+	.detach_client  = saa7111_detach,
+	.command        = saa7111_command,
 };
 
 static struct i2c_client client_template = {
diff -ru usbvision-0.3.3-test5-orig/src/saa7113-new.c usbvision-0.3.3-test5-i2c/src/saa7113-new.c
--- usbvision-0.3.3-test5-orig/src/saa7113-new.c	Wed Oct  2 02:39:07 2002
+++ usbvision-0.3.3-test5-i2c/src/saa7113-new.c	Thu Jul 31 10:04:42 2003
@@ -471,12 +471,13 @@
 }
 
 static struct i2c_driver saa7113_driver = {
-        "SAA7113",
-        I2C_DRIVERID_SAA7113,
-        I2C_DF_NOTIFY,
-        saa7113_probe,
-        saa7113_detach,
-        saa7113_command,
+	.owner          = THIS_MODULE,
+	.name           = "SAA7113",
+	.id             = I2C_DRIVERID_SAA7113,
+	.flags          = I2C_DF_NOTIFY,
+	.attach_adapter = saa7113_probe,
+	.detach_client  = saa7113_detach,
+	.command        = saa7113_command,
 };
 
 static struct i2c_client client_template = {
diff -ru usbvision-0.3.3-test5-orig/src/usbvision.c usbvision-0.3.3-test5-i2c/src/usbvision.c
--- usbvision-0.3.3-test5-orig/src/usbvision.c	Thu Jun  5 11:32:36 2003
+++ usbvision-0.3.3-test5-i2c/src/usbvision.c	Thu Jul 31 10:00:08 2003
@@ -1847,16 +1847,6 @@
 /* I2C functions                                                           */
 /* ----------------------------------------------------------------------- */
 
-static void usbvision_inc_use(struct i2c_adapter *adap)
-{
-	MOD_INC_USE_COUNT;
-}
-
-static void usbvision_dec_use(struct i2c_adapter *adap)
-{
-	MOD_DEC_USE_COUNT;
-}
-
 static void call_i2c_clients(struct usb_usbvision *usbvision, unsigned int cmd,
 			     void *arg)
 {
@@ -2097,15 +2087,14 @@
 };
 
 static struct i2c_adapter i2c_adap_template = {
-	"usbvision",
-	I2C_HW_B_BT848,		/* FIXME */
-	NULL,
-	NULL,
-	usbvision_inc_use,
-	usbvision_dec_use,
-	attach_inform,
-	detach_inform,
-	NULL,
+	.owner             = THIS_MODULE,
+	.name              = "usbvision",
+	.id                = I2C_HW_B_BT848, /* FIXME */
+	.algo              = NULL,
+	.algo_data         = NULL,
+	.client_register   = attach_inform,
+	.client_unregister = detach_inform,
+	.data              = NULL,
 };
 
 static struct i2c_client i2c_client_template = {