10 files changed, 23 insertions, 34 deletions

diff --git a/drivers/i2c/busses/i2c-ali1535.c b/drivers/i2c/busses/i2c-ali1535.c
index c21e4d96382e..704436cdec8e 100644
--- a/drivers/i2c/busses/i2c-ali1535.c
+++ b/drivers/i2c/busses/i2c-ali1535.c
@@ -357,10 +357,6 @@ static s32 ali1535_access(struct i2c_adapter *adap, u16 addr,
         outb_p(0xFF, SMBHSTSTS);
 
         switch (size) {
-        case I2C_SMBUS_PROC_CALL:
-                dev_err(&adap->dev, "I2C_SMBUS_PROC_CALL not supported!\n");
-                result = -EOPNOTSUPP;
-                goto EXIT;
         case I2C_SMBUS_QUICK:
                 outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
                        SMBHSTADD);
@@ -418,6 +414,10 @@ static s32 ali1535_access(struct i2c_adapter *adap, u16 addr,
                                 outb_p(data->block[i], SMBBLKDAT);
                 }
                 break;
+        default:
+                dev_warn(&adap->dev, "Unsupported transaction %d\n", size);
+                result = -EOPNOTSUPP;
+                goto EXIT;
         }
 
         result = ali1535_transaction(adap);
diff --git a/drivers/i2c/busses/i2c-ali1563.c b/drivers/i2c/busses/i2c-ali1563.c
index 30bd3ee70386..da5a382eee93 100644
--- a/drivers/i2c/busses/i2c-ali1563.c
+++ b/drivers/i2c/busses/i2c-ali1563.c
@@ -246,10 +246,6 @@ static s32 ali1563_access(struct i2c_adapter * a, u16 addr,
 
         /* Map the size to what the chip understands */
         switch (size) {
-        case I2C_SMBUS_PROC_CALL:
-                dev_err(&a->dev, "I2C_SMBUS_PROC_CALL not supported!\n");
-                error = -EINVAL;
-                break;
         case I2C_SMBUS_QUICK:
                 size = HST_CNTL2_QUICK;
                 break;
@@ -265,6 +261,10 @@ static s32 ali1563_access(struct i2c_adapter * a, u16 addr,
         case I2C_SMBUS_BLOCK_DATA:
                 size = HST_CNTL2_BLOCK;
                 break;
+        default:
+                dev_warn(&a->dev, "Unsupported transaction %d\n", size);
+                error = -EOPNOTSUPP;
+                goto Done;
         }
 
         outb_p(((addr & 0x7f) << 1) | (rw & 0x01), SMB_HST_ADD);
diff --git a/drivers/i2c/busses/i2c-ali15x3.c b/drivers/i2c/busses/i2c-ali15x3.c
index 3d752561dc37..7b029b147a8e 100644
--- a/drivers/i2c/busses/i2c-ali15x3.c
+++ b/drivers/i2c/busses/i2c-ali15x3.c
@@ -362,9 +362,6 @@ static s32 ali15x3_access(struct i2c_adapter * adap, u16 addr,
         }
 
         switch (size) {
-        case I2C_SMBUS_PROC_CALL:
-                dev_err(&adap->dev, "I2C_SMBUS_PROC_CALL not supported!\n");
-                return -EOPNOTSUPP;
         case I2C_SMBUS_QUICK:
                 outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
                        SMBHSTADD);
@@ -417,6 +414,9 @@ static s32 ali15x3_access(struct i2c_adapter * adap, u16 addr,
                 }
                 size = ALI15X3_BLOCK_DATA;
                 break;
+        default:
+                dev_warn(&adap->dev, "Unsupported transaction %d\n", size);
+                return -EOPNOTSUPP;
         }
 
         outb_p(size, SMBHSTCNT);        /* output command */
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c
index 3d5bcb65e9e0..f0baea62067d 100644
--- a/drivers/i2c/busses/i2c-amd756.c
+++ b/drivers/i2c/busses/i2c-amd756.c
@@ -200,12 +200,7 @@ static s32 amd756_access(struct i2c_adapter * adap, u16 addr,
         int i, len;
         int status;
 
-        /** TODO: Should I supporte the 10-bit transfers? */
         switch (size) {
-        case I2C_SMBUS_PROC_CALL:
-                dev_dbg(&adap->dev, "I2C_SMBUS_PROC_CALL not supported!\n");
-                /* TODO: Well... It is supported, I'm just not sure what to do here... */
-                return -EOPNOTSUPP;
         case I2C_SMBUS_QUICK:
                 outw_p(((addr & 0x7f) << 1) | (read_write & 0x01),
                        SMB_HOST_ADDRESS);
@@ -252,6 +247,9 @@ static s32 amd756_access(struct i2c_adapter * adap, u16 addr,
                 }
                 size = AMD756_BLOCK_DATA;
                 break;
+        default:
+                dev_warn(&adap->dev, "Unsupported transaction %d\n", size);
+                return -EOPNOTSUPP;
         }
 
         /* How about enabling interrupts... */
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 7d6d9dfcc58a..213119211e58 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -513,7 +513,6 @@ static s32 i801_access(struct i2c_adapter * adap, u16 addr,
                         outb_p(command, SMBHSTCMD);
                 block = 1;
                 break;
-        case I2C_SMBUS_PROC_CALL:
         default:
                 dev_err(&I801_dev->dev, "Unsupported transaction %d\n", size);
                 return -EOPNOTSUPP;
diff --git a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
index 77aaa5fe5e38..2bde47509e1a 100644
--- a/drivers/i2c/busses/i2c-piix4.c
+++ b/drivers/i2c/busses/i2c-piix4.c
@@ -307,9 +307,6 @@ static s32 piix4_access(struct i2c_adapter * adap, u16 addr,
         int status;
 
         switch (size) {
-        case I2C_SMBUS_PROC_CALL:
-                dev_err(&adap->dev, "I2C_SMBUS_PROC_CALL not supported!\n");
-                return -EOPNOTSUPP;
         case I2C_SMBUS_QUICK:
                 outb_p((addr << 1) | read_write,
                        SMBHSTADD);
@@ -355,6 +352,9 @@ static s32 piix4_access(struct i2c_adapter * adap, u16 addr,
                 }
                 size = PIIX4_BLOCK_DATA;
                 break;
+        default:
+                dev_warn(&adap->dev, "Unsupported transaction %d\n", size);
+                return -EOPNOTSUPP;
         }
 
         outb_p((size & 0x1C) + (ENABLE_INT9 & 1), SMBHSTCNT);
diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
index c4cc5eddf50d..d7e6ff3e0187 100644
--- a/drivers/i2c/busses/i2c-sis630.c
+++ b/drivers/i2c/busses/i2c-sis630.c
@@ -356,7 +356,8 @@ static s32 sis630_access(struct i2c_adapter *adap, u16 addr,
                         size = SIS630_BLOCK_DATA;
                         return sis630_block_data(adap, data, read_write);
                 default:
-                        printk("Unsupported SMBus operation\n");
+                        dev_warn(&adap->dev, "Unsupported transaction %d\n",
+                                 size);
                         return -EOPNOTSUPP;
         }
 
@@ -378,8 +379,6 @@ static s32 sis630_access(struct i2c_adapter *adap, u16 addr,
                 case SIS630_WORD_DATA:
                         data->word = sis630_read(SMB_BYTE) + (sis630_read(SMB_BYTE + 1) << 8);
                         break;
-                default:
-                        return -EOPNOTSUPP;
         }
 
         return 0;
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 29757b2e11dd..cde8e5880368 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -201,14 +201,8 @@ static s32 sis96x_access(struct i2c_adapter * adap, u16 addr,
                         SIS96x_PROC_CALL : SIS96x_WORD_DATA);
                 break;
 
-        case I2C_SMBUS_BLOCK_DATA:
-                /* TO DO: */
-                dev_info(&adap->dev, "SMBus block not implemented!\n");
-                return -EOPNOTSUPP;
-                break;
-
         default:
-                dev_info(&adap->dev, "Unsupported SMBus operation\n");
+                dev_warn(&adap->dev, "Unsupported transaction %d\n", size);
                 return -EOPNOTSUPP;
         }
 
diff --git a/drivers/i2c/busses/i2c-taos-evm.c b/drivers/i2c/busses/i2c-taos-evm.c
index de9db49e54d9..224aa12ee7c8 100644
--- a/drivers/i2c/busses/i2c-taos-evm.c
+++ b/drivers/i2c/busses/i2c-taos-evm.c
@@ -96,9 +96,8 @@ static int taos_smbus_xfer(struct i2c_adapter *adapter, u16 addr,
                         sprintf(p, "$%02X", command);
                 break;
         default:
-                dev_dbg(&adapter->dev, "Unsupported transaction size %d\n",
-                        size);
-                return -EINVAL;
+                dev_warn(&adapter->dev, "Unsupported transaction %d\n", size);
+                return -EOPNOTSUPP;
         }
 
         /* Send the transaction to the TAOS EVM */
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 7628fe8e0946..c611905df009 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -287,7 +287,7 @@ static s32 vt596_access(struct i2c_adapter *adap, u16 addr,
         return 0;
 
 exit_unsupported:
-        dev_warn(&vt596_adapter.dev, "Unsupported command invoked! (0x%02x)\n",
+        dev_warn(&vt596_adapter.dev, "Unsupported transaction %d\n",
                  size);
         return -EOPNOTSUPP;
 }