From: Jean Delvare Date: Mon, 14 Jul 2008 20:38:26 +0000 (+0200) Subject: i2c: Simplify i2c_del_driver() X-Git-Tag: v2.6.27-rc1~1077^2~32 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f7050bd716047a4dfec7d061e28df7ffd6815ebd;p=karo-tx-linux.git i2c: Simplify i2c_del_driver() i2c_del_driver() can be simplified a bit. Signed-off-by: Jean Delvare --- diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 1a71645038f0..e06067ebd205 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -743,13 +743,11 @@ void i2c_del_driver(struct i2c_driver *driver) { 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); pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name);