3 files changed, 329 insertions, 186 deletions

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index eb8f72ca02f4..d420cc5f5633 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -604,9 +604,7 @@ static int i2c_bit_prepare_bus(struct i2c_adapter *adap)
 
         /* register new adapter to i2c module... */
         adap->algo = &i2c_bit_algo;
-
-        adap->timeout = 100;    /* default values, should       */
-        adap->retries = 3;      /* be replaced by defines       */
+        adap->retries = 3;
 
         return 0;
 }
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index d50b329a3c94..f68e5f8e23ee 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -22,14 +22,18 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/delay.h>
+#include <linux/jiffies.h>
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/i2c.h>
 #include <linux/i2c-algo-pca.h>
 
-#define DEB1(fmt, args...) do { if (i2c_debug>=1) printk(fmt, ## args); } while(0)
-#define DEB2(fmt, args...) do { if (i2c_debug>=2) printk(fmt, ## args); } while(0)
-#define DEB3(fmt, args...) do { if (i2c_debug>=3) printk(fmt, ## args); } while(0)
+#define DEB1(fmt, args...) do { if (i2c_debug >= 1)                     \
+                                 printk(KERN_DEBUG fmt, ## args); } while (0)
+#define DEB2(fmt, args...) do { if (i2c_debug >= 2)                     \
+                                 printk(KERN_DEBUG fmt, ## args); } while (0)
+#define DEB3(fmt, args...) do { if (i2c_debug >= 3)                     \
+                                 printk(KERN_DEBUG fmt, ## args); } while (0)
 
 static int i2c_debug;
 
@@ -43,19 +47,27 @@ static int i2c_debug;
 #define pca_wait(adap) adap->wait_for_completion(adap->data)
 #define pca_reset(adap) adap->reset_chip(adap->data)
 
+static void pca9665_reset(void *pd)
+{
+        struct i2c_algo_pca_data *adap = pd;
+        pca_outw(adap, I2C_PCA_INDPTR, I2C_PCA_IPRESET);
+        pca_outw(adap, I2C_PCA_IND, 0xA5);
+        pca_outw(adap, I2C_PCA_IND, 0x5A);
+}
+
 /*
  * Generate a start condition on the i2c bus.
  *
  * returns after the start condition has occurred
  */
-static void pca_start(struct i2c_algo_pca_data *adap)
+static int pca_start(struct i2c_algo_pca_data *adap)
 {
         int sta = pca_get_con(adap);
         DEB2("=== START\n");
         sta |= I2C_PCA_CON_STA;
         sta &= ~(I2C_PCA_CON_STO|I2C_PCA_CON_SI);
         pca_set_con(adap, sta);
-        pca_wait(adap);
+        return pca_wait(adap);
 }
 
 /*
@@ -63,14 +75,14 @@ static void pca_start(struct i2c_algo_pca_data *adap)
  *
  * return after the repeated start condition has occurred
  */
-static void pca_repeated_start(struct i2c_algo_pca_data *adap)
+static int pca_repeated_start(struct i2c_algo_pca_data *adap)
 {
         int sta = pca_get_con(adap);
         DEB2("=== REPEATED START\n");
         sta |= I2C_PCA_CON_STA;
         sta &= ~(I2C_PCA_CON_STO|I2C_PCA_CON_SI);
         pca_set_con(adap, sta);
-        pca_wait(adap);
+        return pca_wait(adap);
 }
 
 /*
@@ -96,7 +108,7 @@ static void pca_stop(struct i2c_algo_pca_data *adap)
  *
  * returns after the address has been sent
  */
-static void pca_address(struct i2c_algo_pca_data *adap,
+static int pca_address(struct i2c_algo_pca_data *adap,
                         struct i2c_msg *msg)
 {
         int sta = pca_get_con(adap);
@@ -113,7 +125,7 @@ static void pca_address(struct i2c_algo_pca_data *adap,
         sta &= ~(I2C_PCA_CON_STO|I2C_PCA_CON_STA|I2C_PCA_CON_SI);
         pca_set_con(adap, sta);
 
-        pca_wait(adap);
+        return pca_wait(adap);
 }
 
 /*
@@ -121,7 +133,7 @@ static void pca_address(struct i2c_algo_pca_data *adap,
  *
  * Returns after the byte has been transmitted
  */
-static void pca_tx_byte(struct i2c_algo_pca_data *adap,
+static int pca_tx_byte(struct i2c_algo_pca_data *adap,
                         __u8 b)
 {
         int sta = pca_get_con(adap);
@@ -131,7 +143,7 @@ static void pca_tx_byte(struct i2c_algo_pca_data *adap,
         sta &= ~(I2C_PCA_CON_STO|I2C_PCA_CON_STA|I2C_PCA_CON_SI);
         pca_set_con(adap, sta);
 
-        pca_wait(adap);
+        return pca_wait(adap);
 }
 
 /*
@@ -151,7 +163,7 @@ static void pca_rx_byte(struct i2c_algo_pca_data *adap,
  *
  * Returns after next byte has arrived.
  */
-static void pca_rx_ack(struct i2c_algo_pca_data *adap,
+static int pca_rx_ack(struct i2c_algo_pca_data *adap,
                        int ack)
 {
         int sta = pca_get_con(adap);
@@ -162,7 +174,7 @@ static void pca_rx_ack(struct i2c_algo_pca_data *adap,
                 sta |= I2C_PCA_CON_AA;
 
         pca_set_con(adap, sta);
-        pca_wait(adap);
+        return pca_wait(adap);
 }
 
 static int pca_xfer(struct i2c_adapter *i2c_adap,
@@ -175,14 +187,17 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
         int numbytes = 0;
         int state;
         int ret;
-        int timeout = i2c_adap->timeout;
-
-        while ((state = pca_status(adap)) != 0xf8 && timeout--) {
-                msleep(10);
-        }
-        if (state != 0xf8) {
-                dev_dbg(&i2c_adap->dev, "bus is not idle. status is %#04x\n", state);
-                return -EAGAIN;
+        int completed = 1;
+        unsigned long timeout = jiffies + i2c_adap->timeout;
+
+        while (pca_status(adap) != 0xf8) {
+                if (time_before(jiffies, timeout)) {
+                        msleep(10);
+                } else {
+                        dev_dbg(&i2c_adap->dev, "bus is not idle. status is "
+                                "%#04x\n", state);
+                        return -EAGAIN;
+                }
         }
 
         DEB1("{{{ XFER %d messages\n", num);
@@ -218,18 +233,19 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
 
                 switch (state) {
                 case 0xf8: /* On reset or stop the bus is idle */
-                        pca_start(adap);
+                        completed = pca_start(adap);
                         break;
 
                 case 0x08: /* A START condition has been transmitted */
                 case 0x10: /* A repeated start condition has been transmitted */
-                        pca_address(adap, msg);
+                        completed = pca_address(adap, msg);
                         break;
 
                 case 0x18: /* SLA+W has been transmitted; ACK has been received */
                 case 0x28: /* Data byte in I2CDAT has been transmitted; ACK has been received */
                         if (numbytes < msg->len) {
-                                pca_tx_byte(adap, msg->buf[numbytes]);
+                                completed = pca_tx_byte(adap,
+                                                        msg->buf[numbytes]);
                                 numbytes++;
                                 break;
                         }
@@ -237,7 +253,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
                         if (curmsg == num)
                                 pca_stop(adap);
                         else
-                                pca_repeated_start(adap);
+                                completed = pca_repeated_start(adap);
                         break;
 
                 case 0x20: /* SLA+W has been transmitted; NOT ACK has been received */
@@ -246,21 +262,22 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
                         goto out;
 
                 case 0x40: /* SLA+R has been transmitted; ACK has been received */
-                        pca_rx_ack(adap, msg->len > 1);
+                        completed = pca_rx_ack(adap, msg->len > 1);
                         break;
 
                 case 0x50: /* Data bytes has been received; ACK has been returned */
                         if (numbytes < msg->len) {
                                 pca_rx_byte(adap, &msg->buf[numbytes], 1);
                                 numbytes++;
-                                pca_rx_ack(adap, numbytes < msg->len - 1);
+                                completed = pca_rx_ack(adap,
+                                                       numbytes < msg->len - 1);
                                 break;
                         }
                         curmsg++; numbytes = 0;
                         if (curmsg == num)
                                 pca_stop(adap);
                         else
-                                pca_repeated_start(adap);
+                                completed = pca_repeated_start(adap);
                         break;
 
                 case 0x48: /* SLA+R has been transmitted; NOT ACK has been received */
@@ -283,7 +300,7 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
                                 if (curmsg == num)
                                         pca_stop(adap);
                                 else
-                                        pca_repeated_start(adap);
+                                        completed = pca_repeated_start(adap);
                         } else {
                                 DEB2("NOT ACK sent after data byte received. "
                                      "Not final byte. numbytes %d. len %d\n",
@@ -309,11 +326,13 @@ static int pca_xfer(struct i2c_adapter *i2c_adap,
                         break;
                 }
 
+                if (!completed)
+                        goto out;
         }
 
         ret = curmsg;
  out:
-        DEB1(KERN_CRIT "}}} transfered %d/%d messages. "
+        DEB1("}}} transfered %d/%d messages. "
              "status is %#04x. control is %#04x\n",
              curmsg, num, pca_status(adap),
              pca_get_con(adap));
@@ -330,26 +349,171 @@ static const struct i2c_algorithm pca_algo = {
         .functionality  = pca_func,
 };
 
-static int pca_init(struct i2c_adapter *adap)
+static unsigned int pca_probe_chip(struct i2c_adapter *adap)
 {
-        static int freqs[] = {330,288,217,146,88,59,44,36};
-        int clock;
         struct i2c_algo_pca_data *pca_data = adap->algo_data;
-
-        if (pca_data->i2c_clock > 7) {
-                printk(KERN_WARNING "%s: Invalid I2C clock speed selected. Trying default.\n",
-                        adap->name);
-                pca_data->i2c_clock = I2C_PCA_CON_59kHz;
+        /* The trick here is to check if there is an indirect register
+         * available. If there is one, we will read the value we first
+         * wrote on I2C_PCA_IADR. Otherwise, we will read the last value
+         * we wrote on I2C_PCA_ADR
+         */
+        pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_IADR);
+        pca_outw(pca_data, I2C_PCA_IND, 0xAA);
+        pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_ITO);
+        pca_outw(pca_data, I2C_PCA_IND, 0x00);
+        pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_IADR);
+        if (pca_inw(pca_data, I2C_PCA_IND) == 0xAA) {
+                printk(KERN_INFO "%s: PCA9665 detected.\n", adap->name);
+                return I2C_PCA_CHIP_9665;
+        } else {
+                printk(KERN_INFO "%s: PCA9564 detected.\n", adap->name);
+                return I2C_PCA_CHIP_9564;
         }
+}
+
+static int pca_init(struct i2c_adapter *adap)
+{
+        struct i2c_algo_pca_data *pca_data = adap->algo_data;
 
         adap->algo = &pca_algo;
 
-        pca_reset(pca_data);
+        if (pca_probe_chip(adap) == I2C_PCA_CHIP_9564) {
+                static int freqs[] = {330, 288, 217, 146, 88, 59, 44, 36};
+                int clock;
+
+                if (pca_data->i2c_clock > 7) {
+                        switch (pca_data->i2c_clock) {
+                        case 330000:
+                                pca_data->i2c_clock = I2C_PCA_CON_330kHz;
+                                break;
+                        case 288000:
+                                pca_data->i2c_clock = I2C_PCA_CON_288kHz;
+                                break;
+                        case 217000:
+                                pca_data->i2c_clock = I2C_PCA_CON_217kHz;
+                                break;
+                        case 146000:
+                                pca_data->i2c_clock = I2C_PCA_CON_146kHz;
+                                break;
+                        case 88000:
+                                pca_data->i2c_clock = I2C_PCA_CON_88kHz;
+                                break;
+                        case 59000:
+                                pca_data->i2c_clock = I2C_PCA_CON_59kHz;
+                                break;
+                        case 44000:
+                                pca_data->i2c_clock = I2C_PCA_CON_44kHz;
+                                break;
+                        case 36000:
+                                pca_data->i2c_clock = I2C_PCA_CON_36kHz;
+                                break;
+                        default:
+                                printk(KERN_WARNING
+                                        "%s: Invalid I2C clock speed selected."
+                                        " Using default 59kHz.\n", adap->name);
+                        pca_data->i2c_clock = I2C_PCA_CON_59kHz;
+                        }
+                } else {
+                        printk(KERN_WARNING "%s: "
+                                "Choosing the clock frequency based on "
+                                "index is deprecated."
+                                " Use the nominal frequency.\n", adap->name);
+                }
+
+                pca_reset(pca_data);
+
+                clock = pca_clock(pca_data);
+                printk(KERN_INFO "%s: Clock frequency is %dkHz\n",
+                     adap->name, freqs[clock]);
+
+                pca_set_con(pca_data, I2C_PCA_CON_ENSIO | clock);
+        } else {
+                int clock;
+                int mode;
+                int tlow, thi;
+                /* Values can be found on PCA9665 datasheet section 7.3.2.6 */
+                int min_tlow, min_thi;
+                /* These values are the maximum raise and fall values allowed
+                 * by the I2C operation mode (Standard, Fast or Fast+)
+                 * They are used (added) below to calculate the clock dividers
+                 * of PCA9665. Note that they are slightly different of the
+                 * real maximum, to allow the change on mode exactly on the
+                 * maximum clock rate for each mode
+                 */
+                int raise_fall_time;
+
+                struct i2c_algo_pca_data *pca_data = adap->algo_data;
+
+                /* Ignore the reset function from the module,
+                 * we can use the parallel bus reset
+                 */
+                pca_data->reset_chip = pca9665_reset;
+
+                if (pca_data->i2c_clock > 1265800) {
+                        printk(KERN_WARNING "%s: I2C clock speed too high."
+                                " Using 1265.8kHz.\n", adap->name);
+                        pca_data->i2c_clock = 1265800;
+                }
+
+                if (pca_data->i2c_clock < 60300) {
+                        printk(KERN_WARNING "%s: I2C clock speed too low."
+                                " Using 60.3kHz.\n", adap->name);
+                        pca_data->i2c_clock = 60300;
+                }
 
-        clock = pca_clock(pca_data);
-        DEB1(KERN_INFO "%s: Clock frequency is %dkHz\n", adap->name, freqs[clock]);
+                /* To avoid integer overflow, use clock/100 for calculations */
+                clock = pca_clock(pca_data) / 100;
+
+                if (pca_data->i2c_clock > 10000) {
+                        mode = I2C_PCA_MODE_TURBO;
+                        min_tlow = 14;
+                        min_thi  = 5;
+                        raise_fall_time = 22; /* Raise 11e-8s, Fall 11e-8s */
+                } else if (pca_data->i2c_clock > 4000) {
+                        mode = I2C_PCA_MODE_FASTP;
+                        min_tlow = 17;
+                        min_thi  = 9;
+                        raise_fall_time = 22; /* Raise 11e-8s, Fall 11e-8s */
+                } else if (pca_data->i2c_clock > 1000) {
+                        mode = I2C_PCA_MODE_FAST;
+                        min_tlow = 44;
+                        min_thi  = 20;
+                        raise_fall_time = 58; /* Raise 29e-8s, Fall 29e-8s */
+                } else {
+                        mode = I2C_PCA_MODE_STD;
+                        min_tlow = 157;
+                        min_thi  = 134;
+                        raise_fall_time = 127; /* Raise 29e-8s, Fall 98e-8s */
+                }
+
+                /* The minimum clock that respects the thi/tlow = 134/157 is
+                 * 64800 Hz. Below that, we have to fix the tlow to 255 and
+                 * calculate the thi factor.
+                 */
+                if (clock < 648) {
+                        tlow = 255;
+                        thi = 1000000 - clock * raise_fall_time;
+                        thi /= (I2C_PCA_OSC_PER * clock) - tlow;
+                } else {
+                        tlow = (1000000 - clock * raise_fall_time) * min_tlow;
+                        tlow /= I2C_PCA_OSC_PER * clock * (min_thi + min_tlow);
+                        thi = tlow * min_thi / min_tlow;
+                }
 
-        pca_set_con(pca_data, I2C_PCA_CON_ENSIO | clock);
+                pca_reset(pca_data);
+
+                printk(KERN_INFO
+                     "%s: Clock frequency is %dHz\n", adap->name, clock * 100);
+
+                pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_IMODE);
+                pca_outw(pca_data, I2C_PCA_IND, mode);
+                pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_ISCLL);
+                pca_outw(pca_data, I2C_PCA_IND, tlow);
+                pca_outw(pca_data, I2C_PCA_INDPTR, I2C_PCA_ISCLH);
+                pca_outw(pca_data, I2C_PCA_IND, thi);
+
+                pca_set_con(pca_data, I2C_PCA_CON_ENSIO);
+        }
         udelay(500); /* 500 us for oscilator to stabilise */
 
         return 0;
@@ -384,7 +548,7 @@ EXPORT_SYMBOL(i2c_pca_add_numbered_bus);
 
 MODULE_AUTHOR("Ian Campbell <icampbell@arcom.com>, "
         "Wolfram Sang <w.sang@pengutronix.de>");
-MODULE_DESCRIPTION("I2C-Bus PCA9564 algorithm");
+MODULE_DESCRIPTION("I2C-Bus PCA9564/PCA9665 algorithm");
 MODULE_LICENSE("GPL");
 
 module_param(i2c_debug, int, 0);
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index 3e01992230b8..7ce75775ec73 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -1,31 +1,30 @@
-/* ------------------------------------------------------------------------- */
-/* i2c-algo-pcf.c i2c driver algorithms for PCF8584 adapters                 */
-/* ------------------------------------------------------------------------- */
-/*   Copyright (C) 1995-1997 Simon G. Vogl
-                   1998-2000 Hans Berglund
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                */
-/* ------------------------------------------------------------------------- */
-
-/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
-   Frodo Looijaard <frodol@dds.nl> ,and also from Martin Bailey
-   <mbailey@littlefeet-inc.com> */
-
-/* Partially rewriten by Oleg I. Vdovikin <vdovikin@jscc.ru> to handle multiple
-   messages, proper stop/repstart signaling during receive,
-   added detect code */
+/*
+ * i2c-algo-pcf.c i2c driver algorithms for PCF8584 adapters
+ *
+ *   Copyright (C) 1995-1997 Simon G. Vogl
+ *                 1998-2000 Hans Berglund
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
+ * Frodo Looijaard <frodol@dds.nl>, and also from Martin Bailey
+ * <mbailey@littlefeet-inc.com>
+ *
+ * Partially rewriten by Oleg I. Vdovikin <vdovikin@jscc.ru> to handle multiple
+ * messages, proper stop/repstart signaling during receive, added detect code
+ */
 
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -38,17 +37,18 @@
 #include "i2c-algo-pcf.h"
 
 
-#define DEB2(x) if (i2c_debug>=2) x
-#define DEB3(x) if (i2c_debug>=3) x /* print several statistical values*/
-#define DEBPROTO(x) if (i2c_debug>=9) x;
-        /* debug the protocol by showing transferred bits */
+#define DEB2(x) if (i2c_debug >= 2) x
+#define DEB3(x) if (i2c_debug >= 3) x /* print several statistical values */
+#define DEBPROTO(x) if (i2c_debug >= 9) x;
+        /* debug the protocol by showing transferred bits */
 #define DEF_TIMEOUT 16
 
-/* module parameters:
+/*
+ * module parameters:
  */
 static int i2c_debug;
 
-/* --- setting states on the bus with the right timing: --------------- */
+/* setting states on the bus with the right timing: */
 
 #define set_pcf(adap, ctl, val) adap->setpcf(adap->data, ctl, val)
 #define get_pcf(adap, ctl) adap->getpcf(adap->data, ctl)
@@ -57,22 +57,21 @@ static int i2c_debug;
 #define i2c_outb(adap, val) adap->setpcf(adap->data, 0, val)
 #define i2c_inb(adap) adap->getpcf(adap->data, 0)
 
-/* --- other auxiliary functions -------------------------------------- */
+/* other auxiliary functions */
 
-static void i2c_start(struct i2c_algo_pcf_data *adap) 
+static void i2c_start(struct i2c_algo_pcf_data *adap)
 {
-        DEBPROTO(printk("S "));
+        DEBPROTO(printk(KERN_DEBUG "S "));
         set_pcf(adap, 1, I2C_PCF_START);
 }
 
-static void i2c_repstart(struct i2c_algo_pcf_data *adap) 
+static void i2c_repstart(struct i2c_algo_pcf_data *adap)
 {
         DEBPROTO(printk(" Sr "));
         set_pcf(adap, 1, I2C_PCF_REPSTART);
 }
 
-
-static void i2c_stop(struct i2c_algo_pcf_data *adap) 
+static void i2c_stop(struct i2c_algo_pcf_data *adap)
 {
         DEBPROTO(printk("P\n"));
         set_pcf(adap, 1, I2C_PCF_STOP);
@@ -82,17 +81,17 @@ static void handle_lab(struct i2c_algo_pcf_data *adap, const int *status)
 {
         DEB2(printk(KERN_INFO
                 "i2c-algo-pcf.o: lost arbitration (CSR 0x%02x)\n",
-                 *status));
-
-        /* Cleanup from LAB -- reset and enable ESO.
+                *status));
+        /*
+         * Cleanup from LAB -- reset and enable ESO.
          * This resets the PCF8584; since we've lost the bus, no
          * further attempts should be made by callers to clean up
          * (no i2c_stop() etc.)
          */
         set_pcf(adap, 1, I2C_PCF_PIN);
         set_pcf(adap, 1, I2C_PCF_ESO);
-
-        /* We pause for a time period sufficient for any running
+        /*
+         * We pause for a time period sufficient for any running
          * I2C transaction to complete -- the arbitration logic won't
          * work properly until the next START is seen.
          * It is assumed the bus driver or client has set a proper value.
@@ -108,48 +107,50 @@ static void handle_lab(struct i2c_algo_pcf_data *adap, const int *status)
                 get_pcf(adap, 1)));
 }
 
-static int wait_for_bb(struct i2c_algo_pcf_data *adap) {
+static int wait_for_bb(struct i2c_algo_pcf_data *adap)
+{
 
         int timeout = DEF_TIMEOUT;
         int status;
 
         status = get_pcf(adap, 1);
-#ifndef STUB_I2C
-        while (timeout-- && !(status & I2C_PCF_BB)) {
+
+        while (!(status & I2C_PCF_BB) && --timeout) {
                 udelay(100); /* wait for 100 us */
                 status = get_pcf(adap, 1);
         }
-#endif
-        if (timeout <= 0) {
+
+        if (timeout == 0) {
                 printk(KERN_ERR "Timeout waiting for Bus Busy\n");
+                return -ETIMEDOUT;
         }
-        
-        return (timeout<=0);
-}
 
+        return 0;
+}
 
-static int wait_for_pin(struct i2c_algo_pcf_data *adap, int *status) {
+static int wait_for_pin(struct i2c_algo_pcf_data *adap, int *status)
+{
 
         int timeout = DEF_TIMEOUT;
 
         *status = get_pcf(adap, 1);
-#ifndef STUB_I2C
-        while (timeout-- && (*status & I2C_PCF_PIN)) {
+
+        while ((*status & I2C_PCF_PIN) && --timeout) {
                 adap->waitforpin(adap->data);
                 *status = get_pcf(adap, 1);
         }
         if (*status & I2C_PCF_LAB) {
                 handle_lab(adap, status);
-                return(-EINTR);
+                return -EINTR;
         }
-#endif
-        if (timeout <= 0)
-                return(-1);
-        else
-                return(0);
+
+        if (timeout == 0)
+                return -ETIMEDOUT;
+
+        return 0;
 }
 
-/* 
+/*
  * This should perform the 'PCF8584 initialization sequence' as described
  * in the Philips IC12 data book (1995, Aug 29).
  * There should be a 30 clock cycle wait after reset, I assume this
@@ -164,18 +165,21 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap)
 {
         unsigned char temp;
 
-        DEB3(printk(KERN_DEBUG "i2c-algo-pcf.o: PCF state 0x%02x\n", get_pcf(adap, 1)));
+        DEB3(printk(KERN_DEBUG "i2c-algo-pcf.o: PCF state 0x%02x\n",
+                                get_pcf(adap, 1)));
 
         /* S1=0x80: S0 selected, serial interface off */
         set_pcf(adap, 1, I2C_PCF_PIN);
-        /* check to see S1 now used as R/W ctrl -
-           PCF8584 does that when ESO is zero */
+        /*
+         * check to see S1 now used as R/W ctrl -
+         * PCF8584 does that when ESO is zero
+         */
         if (((temp = get_pcf(adap, 1)) & 0x7f) != (0)) {
                 DEB2(printk(KERN_ERR "i2c-algo-pcf.o: PCF detection failed -- can't select S0 (0x%02x).\n", temp));
                 return -ENXIO; /* definetly not PCF8584 */
         }
 
-        /* load own address in S0, effective address is (own << 1)      */
+        /* load own address in S0, effective address is (own << 1) */
         i2c_outb(adap, get_own(adap));
         /* check it's really written */
         if ((temp = i2c_inb(adap)) != get_own(adap)) {
@@ -183,7 +187,7 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap)
                 return -ENXIO;
         }
 
-        /* S1=0xA0, next byte in S2                                     */
+        /* S1=0xA0, next byte in S2 */
         set_pcf(adap, 1, I2C_PCF_PIN | I2C_PCF_ES1);
         /* check to see S2 now selected */
         if (((temp = get_pcf(adap, 1)) & 0x7f) != I2C_PCF_ES1) {
@@ -191,7 +195,7 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap)
                 return -ENXIO;
         }
 
-        /* load clock register S2                                       */
+        /* load clock register S2 */
         i2c_outb(adap, get_clock(adap));
         /* check it's really written, the only 5 lowest bits does matter */
         if (((temp = i2c_inb(adap)) & 0x1f) != get_clock(adap)) {
@@ -199,7 +203,7 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap)
                 return -ENXIO;
         }
 
-        /* Enable serial interface, idle, S0 selected                   */
+        /* Enable serial interface, idle, S0 selected */
         set_pcf(adap, 1, I2C_PCF_IDLE);
 
         /* check to see PCF is really idled and we can access status register */
@@ -207,57 +211,47 @@ static int pcf_init_8584 (struct i2c_algo_pcf_data *adap)
                 DEB2(printk(KERN_ERR "i2c-algo-pcf.o: PCF detection failed -- can't select S1` (0x%02x).\n", temp));
                 return -ENXIO;
         }
-        
+
         printk(KERN_DEBUG "i2c-algo-pcf.o: detected and initialized PCF8584.\n");
 
         return 0;
 }
 
-
-/* ----- Utility functions
- */
-
 static int pcf_sendbytes(struct i2c_adapter *i2c_adap, const char *buf,
-                         int count, int last)
+                         int count, int last)
 {
         struct i2c_algo_pcf_data *adap = i2c_adap->algo_data;
         int wrcount, status, timeout;
-    
+
         for (wrcount=0; wrcount<count; ++wrcount) {
                 DEB2(dev_dbg(&i2c_adap->dev, "i2c_write: writing %2.2X\n",
-                                buf[wrcount]&0xff));
+                                buf[wrcount] & 0xff));
                 i2c_outb(adap, buf[wrcount]);
                 timeout = wait_for_pin(adap, &status);
                 if (timeout) {
-                        if (timeout == -EINTR) {
-                                /* arbitration lost */
-                                return -EINTR;
-                        }
+                        if (timeout == -EINTR)
+                                return -EINTR; /* arbitration lost */
+
                         i2c_stop(adap);
                         dev_err(&i2c_adap->dev, "i2c_write: error - timeout.\n");
                         return -EREMOTEIO; /* got a better one ?? */
                 }
-#ifndef STUB_I2C
                 if (status & I2C_PCF_LRB) {
                         i2c_stop(adap);
                         dev_err(&i2c_adap->dev, "i2c_write: error - no ack.\n");
                         return -EREMOTEIO; /* got a better one ?? */
                 }
-#endif
         }
-        if (last) {
+        if (last)
                 i2c_stop(adap);
-        }
-        else {
+        else
                 i2c_repstart(adap);
-        }
 
-        return (wrcount);
+        return wrcount;
 }
 
-
 static int pcf_readbytes(struct i2c_adapter *i2c_adap, char *buf,
-                         int count, int last)
+                         int count, int last)
 {
         int i, status;
         struct i2c_algo_pcf_data *adap = i2c_adap->algo_data;
@@ -267,42 +261,36 @@ static int pcf_readbytes(struct i2c_adapter *i2c_adap, char *buf,
         for (i = 0; i <= count; i++) {
 
                 if ((wfp = wait_for_pin(adap, &status))) {
-                        if (wfp == -EINTR) {
-                                /* arbitration lost */
-                                return -EINTR;
-                        }
+                        if (wfp == -EINTR)
+                                return -EINTR; /* arbitration lost */
+
                         i2c_stop(adap);
                         dev_err(&i2c_adap->dev, "pcf_readbytes timed out.\n");
-                        return (-1);
+                        return -1;
                 }
 
-#ifndef STUB_I2C
                 if ((status & I2C_PCF_LRB) && (i != count)) {
                         i2c_stop(adap);
                         dev_err(&i2c_adap->dev, "i2c_read: i2c_inb, No ack.\n");
-                        return (-1);
+                        return -1;
                 }
-#endif
-                
+
                 if (i == count - 1) {
                         set_pcf(adap, 1, I2C_PCF_ESO);
-                } else 
-                if (i == count) {
-                        if (last) {
+                } else if (i == count) {
+                        if (last)
                                 i2c_stop(adap);
-                        } else {
+                        else
                                 i2c_repstart(adap);
-                        }
-                };
+                }
 
-                if (i) {
+                if (i)
                         buf[i - 1] = i2c_inb(adap);
-                } else {
+                else
                         i2c_inb(adap); /* dummy read */
-                }
         }
 
-        return (i - 1);
+        return i - 1;
 }
 
 
@@ -323,14 +311,14 @@ static int pcf_doAddress(struct i2c_algo_pcf_data *adap,
 }
 
 static int pcf_xfer(struct i2c_adapter *i2c_adap,
-                    struct i2c_msg *msgs, 
+                    struct i2c_msg *msgs,
                     int num)
 {
         struct i2c_algo_pcf_data *adap = i2c_adap->algo_data;
         struct i2c_msg *pmsg;
         int i;
         int ret=0, timeout, status;
-    
+
         if (adap->xfer_begin)
                 adap->xfer_begin(adap->data);
 
@@ -338,25 +326,24 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,
         timeout = wait_for_bb(adap);
         if (timeout) {
                 DEB2(printk(KERN_ERR "i2c-algo-pcf.o: "
-                            "Timeout waiting for BB in pcf_xfer\n");)
+                            "Timeout waiting for BB in pcf_xfer\n");)
                 i = -EIO;
                 goto out;
         }
-        
+
         for (i = 0;ret >= 0 && i < num; i++) {
                 pmsg = &msgs[i];
 
                 DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: Doing %s %d bytes to 0x%02x - %d of %d messages\n",
                      pmsg->flags & I2C_M_RD ? "read" : "write",
-                     pmsg->len, pmsg->addr, i + 1, num);)
-    
+                     pmsg->len, pmsg->addr, i + 1, num);)
+
                 ret = pcf_doAddress(adap, pmsg);
 
                 /* Send START */
-                if (i == 0) {
-                        i2c_start(adap); 
-                }
-    
+                if (i == 0)
+                        i2c_start(adap);
+
                 /* Wait for PIN (pending interrupt NOT) */
                 timeout = wait_for_pin(adap, &status);
                 if (timeout) {
@@ -371,8 +358,7 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,
                         i = -EREMOTEIO;
                         goto out;
                 }
-    
-#ifndef STUB_I2C
+
                 /* Check LRB (last rcvd bit - slave ack) */
                 if (status & I2C_PCF_LRB) {
                         i2c_stop(adap);
@@ -380,27 +366,24 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,
                         i = -EREMOTEIO;
                         goto out;
                 }
-#endif
-    
+
                 DEB3(printk(KERN_DEBUG "i2c-algo-pcf.o: Msg %d, addr=0x%x, flags=0x%x, len=%d\n",
                             i, msgs[i].addr, msgs[i].flags, msgs[i].len);)
-    
-                /* Read */
+
                 if (pmsg->flags & I2C_M_RD) {
-                        /* read bytes into buffer*/
                         ret = pcf_readbytes(i2c_adap, pmsg->buf, pmsg->len,
-                                            (i + 1 == num));
-        
+                                            (i + 1 == num));
+
                         if (ret != pmsg->len) {
                                 DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: fail: "
                                             "only read %d bytes.\n",ret));
                         } else {
                                 DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: read %d bytes.\n",ret));
                         }
-                } else { /* Write */
+                } else {
                         ret = pcf_sendbytes(i2c_adap, pmsg->buf, pmsg->len,
-                                            (i + 1 == num));
-        
+                                            (i + 1 == num));
+
                         if (ret != pmsg->len) {
                                 DEB2(printk(KERN_DEBUG "i2c-algo-pcf.o: fail: "
                                             "only wrote %d bytes.\n",ret));
@@ -413,24 +396,23 @@ static int pcf_xfer(struct i2c_adapter *i2c_adap,
 out:
         if (adap->xfer_end)
                 adap->xfer_end(adap->data);
-        return (i);
+        return i;
 }
 
 static u32 pcf_func(struct i2c_adapter *adap)
 {
-        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | 
+        return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL |
                I2C_FUNC_PROTOCOL_MANGLING;
 }
 
-/* -----exported algorithm data: -------------------------------------  */
-
+/* exported algorithm data: */
 static const struct i2c_algorithm pcf_algo = {
         .master_xfer    = pcf_xfer,
         .functionality  = pcf_func,
 };
 
-/* 
- * registering functions to load algorithms at runtime 
+/*
+ * registering functions to load algorithms at runtime
  */
 int i2c_pcf_add_bus(struct i2c_adapter *adap)
 {
@@ -441,7 +423,6 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)
 
         /* register new adapter to i2c module... */
         adap->algo = &pcf_algo;
-        adap->timeout = 100;
 
         if ((rval = pcf_init_8584(pcf_adap)))
                 return rval;
@@ -458,4 +439,4 @@ MODULE_LICENSE("GPL");
 
 module_param(i2c_debug, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(i2c_debug,
-        "debug level - 0 off; 1 normal; 2,3 more verbose; 9 pcf-protocol");
+        "debug level - 0 off; 1 normal; 2,3 more verbose; 9 pcf-protocol");