Changeset 4190

Timestamp:

09/28/06 14:56:50 (2 years ago)

Author:

khali

Message:

i2c-algo-bit: Cleanups (2.6 backport)

* Uninline long functions (saves around 1 kB or 15%)
* Refactor code in sclhi()
* Drop redundant udelay on repeated start
* Delete ifdef'd out code

Files:

• i2c/trunk/CHANGES (modified) (1 diff)
• i2c/trunk/kernel/i2c-algo-bit.c (modified) (7 diffs)

i2c/trunk/CHANGES

@@ -11 +11 @@
-  i2c.h: Drop declaration of unimplemented slave functions (2.6 backport)
-  i2c-core: Drop useless bitmasking (2.6 backport)
+  i2c-algo-bit: Cleanups (2.6 backport)
-
-2.10.1 (20060924)

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

@@ -79 +79 @@
- * devices.
- */
-line in
+
-{
-        int start;
@@ -86 +86 @@
-
-        /* Not all adapters have scl sense line... */
-
-
-
-
+
+
-
-        start=jiffies;
@@ -105 +103 @@
-        }
-        DEBSTAT(printk(KERN_DEBUG "needed %ld jiffies\n", jiffies-start));
+
+done:
-        udelay(adap->udelay);
-        return 0;
@@ -125 +125 @@
-        setsda(adap,1);
-        sclhi(adap);
-        udelay(adap->udelay);
-        
-        sdalo(adap);
@@ -310 +309 @@
- * -x transmission error
- */
-line in
+
-                       unsigned char addr, int retries)
-{
@@ -360 +359 @@
-                                /* got a better one ?? */
-                }
-#if 0
-                /* from asm/delay.h */
-                __delay(adap->mdelay * (loops_per_sec / 1000) );
-#endif
-        }
-        return wrcount;
-}
-
-line in
+
-{
-        int inval;
@@ -433 +428 @@
- *      -ETIMEDOUT, for example if the lines are stuck...) 
- */
-line in
+
-{
-        unsigned short flags = msg->flags;