Browse Source

i2c: Simplify i2c_del_driver()

i2c_del_driver() can be simplified a bit.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Jean Delvare 17 years ago
parent
commit
f7050bd716
1 changed files with 4 additions and 6 deletions
  1. 4 6
      drivers/i2c/i2c-core.c

+ 4 - 6
drivers/i2c/i2c-core.c

@@ -743,13 +743,11 @@ void i2c_del_driver(struct i2c_driver *driver)
 {
 {
 	mutex_lock(&core_lock);
 	mutex_lock(&core_lock);
 
 
-	/* new-style driver? */
-	if (is_newstyle_driver(driver))
-		goto unregister;
-
-	class_for_each_device(&i2c_adapter_class, driver, __detach_adapter);
+	/* legacy driver? */
+	if (!is_newstyle_driver(driver))
+		class_for_each_device(&i2c_adapter_class, driver,
+				      __detach_adapter);
 
 
- unregister:
 	driver_unregister(&driver->driver);
 	driver_unregister(&driver->driver);
 	pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name);
 	pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name);