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

The only actual use is to check in zorro_device_probe() that the device
isn't already bound. The driver core already ensures this however so the
check can go away which allows to drop the then assigned-only member
from struct zorro_dev.

If the value was indeed needed somewhere it can always be calculated by

	to_zorro_driver(z->dev.driver)

.

Signed-off-by: Uwe Kleine-König <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>

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;
 }
 
 

diff --git a/include/linux/zorro.h b/include/linux/zorro.h
index e2e4de188d84a6d92b9427c9f45ee12a149f7234..db7416ed60572a7e694657ed124bae2c1af59da6 100644 (file)
--- a/include/linux/zorro.h
+++ b/include/linux/zorro.h
@@ -29,7 +29,6 @@
 struct zorro_dev {
     struct ExpansionRom rom;
     zorro_id id;
-    struct zorro_driver *driver;       /* which driver has allocated this device */
     struct device dev;                 /* Generic device interface */
     u16 slotaddr;
     u16 slotsize;