From fbf91d1c8e27a506f3bf517408e3b771478baa38 Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Tue, 1 May 2007 23:26:32 +0200
Subject: [PATCH] --- yaml --- r: 53255 b: refs/heads/master c:
 b3e820968ad47219f7d559117a30e85cf96b4e4e h: refs/heads/master i:   53253:
 2626ca97af38c1d43a3f5e011b7b1958113f182e   53251:
 b412fede2b3c5aa8030200b72be9c9e440b6c87e   53247:
 2f024ad2cf79ba66292b55b78f462e1a38f0045d v: v3

---
 [refs]                                     |  2 +-
 trunk/Documentation/i2c/writing-clients    |  5 +----
 trunk/drivers/i2c/i2c-core.c               | 12 +++---------
 trunk/drivers/macintosh/therm_windtunnel.c |  3 ++-
 trunk/include/linux/i2c.h                  |  2 +-
 5 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 112c26b37805..e39c62070ba0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a97f1ed090fc01a5876a7caf2cbdf93470436201
+refs/heads/master: b3e820968ad47219f7d559117a30e85cf96b4e4e
diff --git a/trunk/Documentation/i2c/writing-clients b/trunk/Documentation/i2c/writing-clients
index e62fbfa1282d..f7e04ec849b1 100644
--- a/trunk/Documentation/i2c/writing-clients
+++ b/trunk/Documentation/i2c/writing-clients
@@ -586,10 +586,7 @@ the driver module is usually enough.
   void foo_cleanup(void)
   {
     if (foo_initialized == 1) {
-      if ((res = i2c_del_driver(&foo_driver))) {
-        printk("foo: Driver registration failed, module not removed.\n");
-        return;
-      }
+      i2c_del_driver(&foo_driver);
       foo_initialized --;
     }
   }
diff --git a/trunk/drivers/i2c/i2c-core.c b/trunk/drivers/i2c/i2c-core.c
index 0fd4acbffb78..a58f89a6418a 100644
--- a/trunk/drivers/i2c/i2c-core.c
+++ b/trunk/drivers/i2c/i2c-core.c
@@ -599,14 +599,12 @@ EXPORT_SYMBOL(i2c_register_driver);
  * i2c_del_driver - unregister I2C driver
  * @driver: the driver being unregistered
  */
-int i2c_del_driver(struct i2c_driver *driver)
+void i2c_del_driver(struct i2c_driver *driver)
 {
 	struct list_head   *item1, *item2, *_n;
 	struct i2c_client  *client;
 	struct i2c_adapter *adap;
 
-	int res = 0;
-
 	mutex_lock(&core_lists);
 
 	/* new-style driver? */
@@ -620,11 +618,10 @@ int i2c_del_driver(struct i2c_driver *driver)
 	list_for_each(item1,&adapters) {
 		adap = list_entry(item1, struct i2c_adapter, list);
 		if (driver->detach_adapter) {
-			if ((res = driver->detach_adapter(adap))) {
+			if (driver->detach_adapter(adap)) {
 				dev_err(&adap->dev, "detach_adapter failed "
 					"for driver [%s]\n",
 					driver->driver.name);
-				goto out_unlock;
 			}
 		} else {
 			list_for_each_safe(item2, _n, &adap->clients) {
@@ -634,12 +631,11 @@ int i2c_del_driver(struct i2c_driver *driver)
 				dev_dbg(&adap->dev, "detaching client [%s] "
 					"at 0x%02x\n", client->name,
 					client->addr);
-				if ((res = driver->detach_client(client))) {
+				if (driver->detach_client(client)) {
 					dev_err(&adap->dev, "detach_client "
 						"failed for client [%s] at "
 						"0x%02x\n", client->name,
 						client->addr);
-					goto out_unlock;
 				}
 			}
 		}
@@ -650,9 +646,7 @@ int i2c_del_driver(struct i2c_driver *driver)
 	list_del(&driver->list);
 	pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name);
 
- out_unlock:
 	mutex_unlock(&core_lists);
-	return 0;
 }
 EXPORT_SYMBOL(i2c_del_driver);
 
diff --git a/trunk/drivers/macintosh/therm_windtunnel.c b/trunk/drivers/macintosh/therm_windtunnel.c
index 35233de460ad..3d0354e96a97 100644
--- a/trunk/drivers/macintosh/therm_windtunnel.c
+++ b/trunk/drivers/macintosh/therm_windtunnel.c
@@ -459,7 +459,8 @@ therm_of_probe( struct of_device *dev, const struct of_device_id *match )
 static int
 therm_of_remove( struct of_device *dev )
 {
-	return i2c_del_driver( &g4fan_driver );
+	i2c_del_driver( &g4fan_driver );
+	return 0;
 }
 
 static struct of_device_id therm_of_match[] = {{
diff --git a/trunk/include/linux/i2c.h b/trunk/include/linux/i2c.h
index 3af7111c6680..3fe2ad37da30 100644
--- a/trunk/include/linux/i2c.h
+++ b/trunk/include/linux/i2c.h
@@ -371,7 +371,7 @@ extern int i2c_del_adapter(struct i2c_adapter *);
 extern int i2c_add_numbered_adapter(struct i2c_adapter *);
 
 extern int i2c_register_driver(struct module *, struct i2c_driver *);
-extern int i2c_del_driver(struct i2c_driver *);
+extern void i2c_del_driver(struct i2c_driver *);
 
 static inline int i2c_add_driver(struct i2c_driver *driver)
 {