Changeset 3758 for i2c/trunk/kernel/i2c-algo-biths.c

Timestamp:

01/14/03 00:22:50 (10 years ago)

Author:

kmalkki

Message:

(Kyösti)

Check in changes from 2.5.53 to 2.5.54).
Apply respective changes to other drivers in CVS.

Files:

• i2c/trunk/kernel/i2c-algo-biths.c (modified) (3 diffs)

i2c/trunk/kernel/i2c-algo-biths.c

@@ -586 +586 @@
 
 static struct i2c_algorithm i2c_algo_biths = {
-        "Bit-shift algorithm",
-        I2C_ALGO_BIT,
-        bit_xfer,
-        NULL,
-        NULL,                           /* slave_xmit           */
-        NULL,                           /* slave_recv           */
-        algo_control,                   /* ioctl                */
-        bit_func,                       /* functionality        */
+        .name           = "Bit-shift algorithm",
+        .id             = I2C_ALGO_BIT,
+        .master_xfer    = bit_xfer,
+        .algo_control   = algo_control,
+        .functionality  = bit_func,
 };
 
@@ -744 +741 @@
         DEB1(printk(KERN_DEBUG "i2c-algo-biths.o: hw routines for %s registered.\n",
                     i2c_adap->name));
-        
-        /* register new adapter to i2c module... */
-
-        i2c_adap->id |= i2c_algo_biths.id;
-        i2c_adap->algo = &i2c_algo_biths;
-
-        i2c_adap->timeout = HZ; /* default values, should       */
-        i2c_adap->retries = 3;  /* be replaced by defines       */
-
-#ifdef MODULE
-        MOD_INC_USE_COUNT;
-#endif
-        i2c_add_adapter(i2c_adap);
-
-        return 0;
-}
-
-
-int i2c_biths_del_bus(struct i2c_adapter *i2c_adap)
-{
-        int res;
-
-        if ((res = i2c_del_adapter(i2c_adap)) < 0)
-                return res;
-
-        DEB1(printk(KERN_DEBUG "i2c-algo-biths.o: adapter unregistered: %s\n",i2c_adap->name));
-
-#ifdef MODULE
-        MOD_DEC_USE_COUNT;
-#endif
-        return 0;
-}
-
-int __init i2c_algo_biths_init (void)
-{
-        printk(KERN_INFO "i2c-algo-biths.o: i2c high-speed bit algorithm module version %s (%s)\n", I2C_VERSION, I2C_DATE);
 #ifdef rdtscl
         DEB1(printk(KERN_DEBUG "i2c-algo-biths.o:  ... will use rdtscl() for bus clock\n"));
 #else
-        DEB1(printk(KERN_DEBUG "i2c-algo-biths.o:  ... will use udelay() for bus clock\n");
+        DEB1(printk(KERN_DEBUG "i2c-algo-biths.o:  ... will use udelay() for bus clock\n"));
 #endif
+        
+        /* register new adapter to i2c module... */
+
+        i2c_adap->id |= i2c_algo_biths.id;
+        i2c_adap->algo = &i2c_algo_biths;
+
+        i2c_adap->timeout = HZ; /* default values, should       */
+        i2c_adap->retries = 3;  /* be replaced by defines       */
+
+        i2c_add_adapter(i2c_adap);
+
         return 0;
 }
 
 
+int i2c_biths_del_bus(struct i2c_adapter *i2c_adap)
+{
+        int res;
+
+        if ((res = i2c_del_adapter(i2c_adap)) < 0)
+                return res;
+
+        DEB1(printk(KERN_DEBUG "i2c-algo-biths.o: adapter unregistered: %s\n",i2c_adap->name));
+
+        return 0;
+}
 
 EXPORT_SYMBOL(i2c_biths_add_bus);
 EXPORT_SYMBOL(i2c_biths_del_bus);
 
-#ifdef MODULE
 MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>");
 MODULE_DESCRIPTION("I2C-Bus bit-banging algorithm");
@@ -804 +786 @@
 MODULE_PARM_DESC(i2c_debug,
             "debug level - 1 use; 2 fatal, 3 +proto; 4 all, 5 +proto");
-
-int init_module(void) 
-{
-        return i2c_algo_biths_init();
-}
-
-void cleanup_module(void) 
-{
-}
-#endif