i2c_del_driver() can be simplified a bit.

Signed-off-by: Jean Delvare <[EMAIL PROTECTED]>
---
 drivers/i2c/i2c-core.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

--- linux-2.6.26-rc3.orig/drivers/i2c/i2c-core.c        2008-05-20 
22:41:10.000000000 +0200
+++ linux-2.6.26-rc3/drivers/i2c/i2c-core.c     2008-05-20 22:42:56.000000000 
+0200
@@ -743,13 +743,11 @@ void i2c_del_driver(struct i2c_driver *d
 {
        mutex_lock(&core_lock);
 
-       /* new-style driver? */
-       if (is_newstyle_driver(driver))
-               goto unregister;
+       /* legacy driver? */
+       if (!is_newstyle_driver(driver))
+               class_for_each_device(&i2c_adapter_class, driver,
+                                     __detach_adapter);
 
-       class_for_each_device(&i2c_adapter_class, driver, __detach_adapter);
-
- unregister:
        driver_unregister(&driver->driver);
        pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name);
 


-- 
Jean Delvare

_______________________________________________
i2c mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/i2c

Reply via email to