1 files changed, 30 insertions, 31 deletions

diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index dd364171f9c5..b6807db7b36f 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -1,23 +1,23 @@
 /*
-    Copyright (c) 2000  Frodo Looijaard <frodol@dds.nl>, 
-                        Philip Edelbrock <phil@netroedge.com>, 
-                        Mark D. Studebaker <mdsxyz123@yahoo.com>,
-                        Dan Eaton <dan.eaton@rocketlogix.com> and 
-                        Stephen Rousset<stephen.rousset@rocketlogix.com> 
-
-    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.
+ * Copyright (c) 2000  Frodo Looijaard <frodol@dds.nl>,
+ *                      Philip Edelbrock <phil@netroedge.com>,
+ *                      Mark D. Studebaker <mdsxyz123@yahoo.com>,
+ *                      Dan Eaton <dan.eaton@rocketlogix.com> and
+ *                      Stephen Rousset <stephen.rousset@rocketlogix.com>
+ *
+ *  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.
 */
 
 /*
@@ -254,8 +254,8 @@ static int ali1535_transaction(struct i2c_adapter *adap)
         if (temp & (ALI1535_STS_ERR | ALI1535_STS_BUSY)) {
                 /* do a clear-on-write */
                 outb_p(0xFF, SMBHSTSTS);
-                if ((temp = inb_p(SMBHSTSTS)) &
-                    (ALI1535_STS_ERR | ALI1535_STS_BUSY)) {
+                temp = inb_p(SMBHSTSTS);
+                if (temp & (ALI1535_STS_ERR | ALI1535_STS_BUSY)) {
                         /* This is probably going to be correctable only by a
                          * power reset as one of the bits now appears to be
                          * stuck */
@@ -267,9 +267,8 @@ static int ali1535_transaction(struct i2c_adapter *adap)
                 }
         } else {
                 /* check and clear done bit */
-                if (temp & ALI1535_STS_DONE) {
+                if (temp & ALI1535_STS_DONE)
                         outb_p(temp, SMBHSTSTS);
-                }
         }
 
         /* start the transaction by writing anything to the start register */
@@ -278,7 +277,7 @@ static int ali1535_transaction(struct i2c_adapter *adap)
         /* We will always wait for a fraction of a second! */
         timeout = 0;
         do {
-                msleep(1);
+                usleep_range(1000, 2000);
                 temp = inb_p(SMBHSTSTS);
         } while (((temp & ALI1535_STS_BUSY) && !(temp & ALI1535_STS_IDLE))
                  && (timeout++ < MAX_TIMEOUT));
@@ -325,12 +324,12 @@ static int ali1535_transaction(struct i2c_adapter *adap)
         /* take consequent actions for error conditions */
         if (!(temp & ALI1535_STS_DONE)) {
                 /* issue "kill" to reset host controller */
-                outb_p(ALI1535_KILL,SMBHSTTYP);
-                outb_p(0xFF,SMBHSTSTS);
+                outb_p(ALI1535_KILL, SMBHSTTYP);
+                outb_p(0xFF, SMBHSTSTS);
         } else if (temp & ALI1535_STS_ERR) {
                 /* issue "timeout" to reset all devices on bus */
-                outb_p(ALI1535_T_OUT,SMBHSTTYP);
-                outb_p(0xFF,SMBHSTSTS);
+                outb_p(ALI1535_T_OUT, SMBHSTTYP);
+                outb_p(0xFF, SMBHSTSTS);
         }
 
         return result;
@@ -351,7 +350,7 @@ static s32 ali1535_access(struct i2c_adapter *adap, u16 addr,
         for (timeout = 0;
              (timeout < MAX_TIMEOUT) && !(temp & ALI1535_STS_IDLE);
              timeout++) {
-                msleep(1);
+                usleep_range(1000, 2000);
                 temp = inb_p(SMBHSTSTS);
         }
         if (timeout >= MAX_TIMEOUT)
@@ -480,12 +479,12 @@ static struct i2c_adapter ali1535_adapter = {
         .algo           = &smbus_algorithm,
 };
 
-static const struct pci_device_id ali1535_ids[] = {
+static DEFINE_PCI_DEVICE_TABLE(ali1535_ids) = {
         { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) },
         { },
 };
 
-MODULE_DEVICE_TABLE (pci, ali1535_ids);
+MODULE_DEVICE_TABLE(pci, ali1535_ids);
 
 static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {