Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c: Convert most new-style drivers to use module aliasing
  i2c: Add support for device alias names
  i2c-amd756-s4882: Fix an error path
  i2c: Drop unused RTC driver IDs
  i2c/tps65010: Add missing intialization of client data
  i2c-sis5595: Minor cleanups in sis5595_access
  i2c-piix4: Minor cleanups
  i2c: Spelling fix (successful)
  i2c-stub: No newline in parameter description

1 files changed, 2 insertions, 8 deletions

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;