zorro: Drop useless (and hardly used) .driver member in struct zorro_dev

[people/ms/linux.git] / drivers / zorro / zorro-driver.c

diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index ab06c9ce2c787a40d8626af978f86595dfdb4e0d..96f068830549e057d5988a9909432ee1ecafdc51 100644 (file)
--- a/drivers/zorro/zorro-driver.c
+++ b/drivers/zorro/zorro-driver.c
@@ -47,16 +47,14 @@ static int zorro_device_probe(struct device *dev)
        struct zorro_driver *drv = to_zorro_driver(dev->driver);
        struct zorro_dev *z = to_zorro_dev(dev);
 
-       if (!z->driver && drv->probe) {
+       if (drv->probe) {
                const struct zorro_device_id *id;
 
                id = zorro_match_device(drv->id_table, z);
                if (id)
                        error = drv->probe(z, id);
-               if (error >= 0) {
-                       z->driver = drv;
+               if (error >= 0)
                        error = 0;
-               }
        }
        return error;
 }
@@ -69,7 +67,6 @@ static void zorro_device_remove(struct device *dev)
 
        if (drv->remove)
                drv->remove(z);
-       z->driver = NULL;
 }