Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-isa.c

diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index 03672c9ca4092ade4a0590d598b38a9fda259147..9f2ffef4d81204a3a0f3f11876188d0ba06b4e94 100644 (file)
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -92,15 +92,13 @@ int i2c_isa_add_driver(struct i2c_driver *driver)
        int res;
 
        /* Add the driver to the list of i2c drivers in the driver core */
-       driver->driver.name = driver->name;
-       driver->driver.owner = driver->owner;
        driver->driver.bus = &i2c_bus_type;
        driver->driver.probe = i2c_isa_device_probe;
        driver->driver.remove = i2c_isa_device_remove;
        res = driver_register(&driver->driver);
        if (res)
                return res;
-       dev_dbg(&isa_adapter.dev, "Driver %s registered\n", driver->name);
+       dev_dbg(&isa_adapter.dev, "Driver %s registered\n", driver->driver.name);
 
        /* Now look for clients */
        driver->attach_adapter(&isa_adapter);
@@ -124,14 +122,14 @@ int i2c_isa_del_driver(struct i2c_driver *driver)
                if ((res = driver->detach_client(client))) {
                        dev_err(&isa_adapter.dev, "Failed, driver "
                                "%s not unregistered!\n",
-                               driver->name);
+                               driver->driver.name);
                        return res;
                }
        }
 
        /* Get the driver off the core list */
        driver_unregister(&driver->driver);
-       dev_dbg(&isa_adapter.dev, "Driver %s unregistered\n", driver->name);
+       dev_dbg(&isa_adapter.dev, "Driver %s unregistered\n", driver->driver.name);
 
        return 0;
 }
@@ -176,7 +174,7 @@ static void __exit i2c_isa_exit(void)
        list_for_each_safe(item, _n, &isa_adapter.clients) {
                client = list_entry(item, struct i2c_client, list);
                dev_err(&isa_adapter.dev, "Driver %s still has an active "
-                       "ISA client at 0x%x\n", client->driver->name,
+                       "ISA client at 0x%x\n", client->driver->driver.name,
                        client->addr);
        }
        if (client != NULL)