6 files changed, 11 insertions, 25 deletions

diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
index e5e96c817566..c38a0a112208 100644
--- a/drivers/i2c/busses/i2c-amd756-s4882.c
+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
@@ -1,7 +1,7 @@
 /*
  * i2c-amd756-s4882.c - i2c-amd756 extras for the Tyan S4882 motherboard
  *
- * Copyright (C) 2004 Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2004, 2008 Jean Delvare <khali@linux-fr.org>
  *
  * 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
@@ -231,7 +231,8 @@ ERROR2:
         kfree(s4882_adapter);
         s4882_adapter = NULL;
 ERROR1:
-        i2c_del_adapter(&amd756_smbus);
+        /* Restore physical bus */
+        i2c_add_adapter(&amd756_smbus);
 ERROR0:
         return error;
 }
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 9bbe96cef719..fdc9ad805e35 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -38,7 +38,6 @@
 #include <linux/ioport.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
-#include <linux/apm_bios.h>
 #include <linux/dmi.h>
 #include <asm/io.h>
 
@@ -223,7 +222,7 @@ static int piix4_transaction(void)
                         dev_err(&piix4_adapter.dev, "Failed! (%02x)\n", temp);
                         return -1;
                 } else {
-                        dev_dbg(&piix4_adapter.dev, "Successfull!\n");
+                        dev_dbg(&piix4_adapter.dev, "Successful!\n");
                 }
         }
 
@@ -343,12 +342,7 @@ static s32 piix4_access(struct i2c_adapter * adap, u16 addr,
 
 
         switch (size) {
-        case PIIX4_BYTE:        /* Where is the result put? I assume here it is in
-                                   SMBHSTDAT0 but it might just as well be in the
-                                   SMBHSTCMD. No clue in the docs */
-
-                data->byte = inb_p(SMBHSTDAT0);
-                break;
+        case PIIX4_BYTE:
         case PIIX4_BYTE_DATA:
                 data->byte = inb_p(SMBHSTDAT0);
                 break;
diff --git a/drivers/i2c/busses/i2c-sis5595.c b/drivers/i2c/busses/i2c-sis5595.c
index 283769cecee2..9ca8f9155f95 100644
--- a/drivers/i2c/busses/i2c-sis5595.c
+++ b/drivers/i2c/busses/i2c-sis5595.c
@@ -238,7 +238,7 @@ static int sis5595_transaction(struct i2c_adapter *adap)
                         dev_dbg(&adap->dev, "Failed! (%02x)\n", temp);
                         return -1;
                 } else {
-                        dev_dbg(&adap->dev, "Successfull!\n");
+                        dev_dbg(&adap->dev, "Successful!\n");
                 }
         }
 
@@ -316,14 +316,8 @@ static s32 sis5595_access(struct i2c_adapter *adap, u16 addr,
                 }
                 size = (size == I2C_SMBUS_PROC_CALL) ? SIS5595_PROC_CALL : SIS5595_WORD_DATA;
                 break;
-/*
-        case I2C_SMBUS_BLOCK_DATA:
-                printk(KERN_WARNING "sis5595.o: Block data not yet implemented!\n");
-                return -1;
-                break;
-*/
         default:
-                printk(KERN_WARNING "sis5595.o: Unsupported transaction %d\n", size);
+                dev_warn(&adap->dev, "Unsupported transaction %d\n", size);
                 return -1;
         }
 
@@ -338,9 +332,7 @@ static s32 sis5595_access(struct i2c_adapter *adap, u16 addr,
 
 
         switch (size) {
-        case SIS5595_BYTE:      /* Where is the result put? I assume here it is in
-                                   SMB_DATA but it might just as well be in the
-                                   SMB_CMD. No clue in the docs */
+        case SIS5595_BYTE:
         case SIS5595_BYTE_DATA:
                 data->byte = sis5595_read(SMB_BYTE);
                 break;
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index 5fd734f99ee9..3765dd7f450f 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -136,7 +136,7 @@ static int sis630_transaction_start(struct i2c_adapter *adap, int size, u8 *oldc
                         dev_dbg(&adap->dev, "Failed! (%02x)\n", temp);
                         return -1;
                 } else {
-                        dev_dbg(&adap->dev, "Successfull!\n");
+                        dev_dbg(&adap->dev, "Successful!\n");
                 }
         }
 
diff --git a/drivers/i2c/busses/i2c-stub.c b/drivers/i2c/busses/i2c-stub.c
index c2a9f8c94f5e..d08eeec53913 100644
--- a/drivers/i2c/busses/i2c-stub.c
+++ b/drivers/i2c/busses/i2c-stub.c
@@ -33,7 +33,7 @@
 static unsigned short chip_addr[MAX_CHIPS];
 module_param_array(chip_addr, ushort, NULL, S_IRUGO);
 MODULE_PARM_DESC(chip_addr,
-                 "Chip addresses (up to 10, between 0x03 and 0x77)\n");
+                 "Chip addresses (up to 10, between 0x03 and 0x77)");
 
 struct stub_chip {
         u8 pointer;
diff --git a/drivers/i2c/busses/i2c-taos-evm.c b/drivers/i2c/busses/i2c-taos-evm.c
index 1b0cfd5472fd..de9db49e54d9 100644
--- a/drivers/i2c/busses/i2c-taos-evm.c
+++ b/drivers/i2c/busses/i2c-taos-evm.c
@@ -51,7 +51,6 @@ struct taos_data {
 /* TAOS TSL2550 EVM */
 static struct i2c_board_info tsl2550_info = {
         I2C_BOARD_INFO("tsl2550", 0x39),
-        .type   = "tsl2550",
 };
 
 /* Instantiate i2c devices based on the adapter name */
@@ -59,7 +58,7 @@ static struct i2c_client *taos_instantiate_device(struct i2c_adapter *adapter)
 {
         if (!strncmp(adapter->name, "TAOS TSL2550 EVM", 16)) {
                 dev_info(&adapter->dev, "Instantiating device %s at 0x%02x\n",
-                        tsl2550_info.driver_name, tsl2550_info.addr);
+                        tsl2550_info.type, tsl2550_info.addr);
                 return i2c_new_device(adapter, &tsl2550_info);
         }