diff options
author | Jean Delvare <khali@linux-fr.org> | 2008-07-14 16:38:26 -0400 |
---|---|---|
committer | Jean Delvare <khali@mahadeva.delvare> | 2008-07-14 16:38:26 -0400 |
commit | f7050bd716047a4dfec7d061e28df7ffd6815ebd (patch) | |
tree | 2520cb8b75194b4298f3893202a84de14e13e837 /drivers/i2c | |
parent | 6a03cd931196673634b58c955d2f9d42da602045 (diff) |
i2c: Simplify i2c_del_driver()
i2c_del_driver() can be simplified a bit.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/i2c-core.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 1a71645038f..e06067ebd20 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) | |||
743 | { | 743 | { |
744 | mutex_lock(&core_lock); | 744 | mutex_lock(&core_lock); |
745 | 745 | ||
746 | /* new-style driver? */ | 746 | /* legacy driver? */ |
747 | if (is_newstyle_driver(driver)) | 747 | if (!is_newstyle_driver(driver)) |
748 | goto unregister; | 748 | class_for_each_device(&i2c_adapter_class, driver, |
749 | 749 | __detach_adapter); | |
750 | class_for_each_device(&i2c_adapter_class, driver, __detach_adapter); | ||
751 | 750 | ||
752 | unregister: | ||
753 | driver_unregister(&driver->driver); | 751 | driver_unregister(&driver->driver); |
754 | pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name); | 752 | pr_debug("i2c-core: driver [%s] unregistered\n", driver->driver.name); |
755 | 753 | ||