From b097de4ba4a2f41bdc2ad6238aceb1e074bb00e2 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Thu, 1 May 2008 10:22:49 +0000
Subject: [PATCH] Minor cleanups in sis5595_access, backported from Linux 2.6:
 * Remove commented-out code. * Remove a legacy comment.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5216 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES                     |  1 +
 kernel/busses/i2c-sis5595.c | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2dc73344..a609d92a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ SVN-HEAD
   Library: Don't choke on unrecognized devices, part 2
   Module i2c-i801: Drop broken I2C block read support
   Module i2c-piix4: Minor cleanups (2.6 backport)
+  Module i2c-sis5595: Minor cleanups (2.6 backport)
   Program sensors-detect: New device ID for the SMSC SCH5317
                           Add SMSC SCH5127 detection
                           Add National Semiconductor LM64 detection
diff --git a/kernel/busses/i2c-sis5595.c b/kernel/busses/i2c-sis5595.c
index e0c8b6ce..6c729ce7 100644
--- a/kernel/busses/i2c-sis5595.c
+++ b/kernel/busses/i2c-sis5595.c
@@ -357,12 +357,6 @@ s32 sis5595_access(struct i2c_adapter * adap, u16 addr,
 		     I2C_SMBUS_PROC_CALL) ? SIS5595_PROC_CALL :
 		    SIS5595_WORD_DATA;
 		break;
-/*
-	case I2C_SMBUS_BLOCK_DATA:
-		printk("sis5595.o: Block data not yet implemented!\n");
-		return -1;
-		break;
-*/
 	default:
 		printk
 		    (KERN_WARNING "sis5595.o: Unsupported transaction %d\n", size);
@@ -380,9 +374,7 @@ 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;