From e33d1927cd97d36f3ae0b360eb20f9eb91da4c7a Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sun, 6 Dec 2009 17:06:26 +0100
Subject: [PATCH] --- yaml --- r: 172367 b: refs/heads/master c:
 c2e90e9b6835d71cbadd42fe5b38704acaccf8aa h: refs/heads/master i:   172365:
 80f77983ee73f6bb3a1efc1d2d6776302798a85e   172363:
 b56c85536b229771deda162e858431eee53356eb   172359:
 540f49ec23c06ba1d3f1c0f5f76755ea114c6b24   172351:
 dbb32306ea1c978f4a396cc9bdf39f9086f5098d v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/misc/ics932s401.c | 37 +++++++++++++--------------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index f362a88f1821..cb93aa4ceb9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ccfbbd082a1c71667bead7124591ccd09f08ac90
+refs/heads/master: c2e90e9b6835d71cbadd42fe5b38704acaccf8aa
diff --git a/trunk/drivers/misc/ics932s401.c b/trunk/drivers/misc/ics932s401.c
index 6e43ab4231ae..4bb7a3af9ad9 100644
--- a/trunk/drivers/misc/ics932s401.c
+++ b/trunk/drivers/misc/ics932s401.c
@@ -417,32 +417,25 @@ static int ics932s401_detect(struct i2c_client *client, int kind,
 			  struct i2c_board_info *info)
 {
 	struct i2c_adapter *adapter = client->adapter;
+	int vendor, device, revision;
 
 	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
 		return -ENODEV;
 
-	if (kind <= 0) {
-		int vendor, device, revision;
-
-		vendor = i2c_smbus_read_word_data(client,
-						  ICS932S401_REG_VENDOR_REV);
-		vendor >>= 8;
-		revision = vendor >> ICS932S401_REV_SHIFT;
-		vendor &= ICS932S401_VENDOR_MASK;
-		if (vendor != ICS932S401_VENDOR)
-			return -ENODEV;
-
-		device = i2c_smbus_read_word_data(client,
-						  ICS932S401_REG_DEVICE);
-		device >>= 8;
-		if (device != ICS932S401_DEVICE)
-			return -ENODEV;
-
-		if (revision != ICS932S401_REV)
-			dev_info(&adapter->dev, "Unknown revision %d\n",
-				 revision);
-	} else
-		dev_dbg(&adapter->dev, "detection forced\n");
+	vendor = i2c_smbus_read_word_data(client, ICS932S401_REG_VENDOR_REV);
+	vendor >>= 8;
+	revision = vendor >> ICS932S401_REV_SHIFT;
+	vendor &= ICS932S401_VENDOR_MASK;
+	if (vendor != ICS932S401_VENDOR)
+		return -ENODEV;
+
+	device = i2c_smbus_read_word_data(client, ICS932S401_REG_DEVICE);
+	device >>= 8;
+	if (device != ICS932S401_DEVICE)
+		return -ENODEV;
+
+	if (revision != ICS932S401_REV)
+		dev_info(&adapter->dev, "Unknown revision %d\n", revision);
 
 	strlcpy(info->type, "ics932s401", I2C_NAME_SIZE);