Changeset 1936 for lm-sensors/trunk/kernel/busses/i2c-nforce2.c

Timestamp:

08/03/03 07:11:58 (10 years ago)

Author:

mmh

Message:

Added utility function i2c_delay(1), to replace various "do_pause"
(mmh) functions in bus drivers. Backported from the 2.6 work of Greg KH.

Files:

• lm-sensors/trunk/kernel/busses/i2c-nforce2.c (modified) (4 diffs)

lm-sensors/trunk/kernel/busses/i2c-nforce2.c

@@ -113 +113 @@
                        unsigned short flags, char read_write,
                        u8 command, int size, union i2c_smbus_data *data);
-#if 0
-static void nforce2_do_pause(unsigned int amount);
-#endif
 /*
 static int nforce2_block_transaction(union i2c_smbus_data *data,
@@ -129 +126 @@
         .functionality = nforce2_func,
 };
-
-
-
-#if 0
-/* Internally used pause function */
-void nforce2_do_pause(unsigned int amount)
-{
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(amount);
-}
-#endif
 
 /* Return -1 on error. See smbus.h for more information */
@@ -251 +237 @@
 #if 0
         do {
-                nforce2_do_pause(1);
+                i2c_delay(1);
                 temp = inb_p(NVIDIA_SMB_STS);
         } while (((temp & NVIDIA_SMB_STS_DONE) == 0) && (timeout++ < MAX_TIMEOUT));
@@ -260 +246 @@
         }
         if (~temp & NVIDIA_SMB_STS_DONE) {
-                current->state = TASK_INTERRUPTIBLE;
-                schedule_timeout(HZ/100);
+                i2c_delay(HZ/100);
                 temp = inb_p(NVIDIA_SMB_STS);
         }