i2c: Let new-style drivers implement attach_adapter
authorJean Delvare <khali@linux-fr.org>
Mon, 13 Apr 2009 15:02:14 +0000 (17:02 +0200)
committerJean Delvare <khali@linux-fr.org>
Mon, 13 Apr 2009 15:02:14 +0000 (17:02 +0200)
While it isn't the way the standard device binding model works, it is
OK for new-style drivers to implement attach_adapter. It may help
convert the renaming legacy drivers to new style drivers faster.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: David Brownell <dbrownell@users.sourceforge.net>
drivers/i2c/i2c-core.c

index b6f3a0d..85e2e91 100644 (file)
@@ -716,8 +716,7 @@ int i2c_register_driver(struct module *owner, struct i2c_driver *driver)
 
        /* new style driver methods can't mix with legacy ones */
        if (is_newstyle_driver(driver)) {
-               if (driver->attach_adapter || driver->detach_adapter
-                               || driver->detach_client) {
+               if (driver->detach_adapter || driver->detach_client) {
                        printk(KERN_WARNING
                                        "i2c-core: driver [%s] is confused\n",
                                        driver->driver.name);