diff options
| author |   Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2021-07-30 21:10:35 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-05 14:37:04 +0200 |
| commit | fac58b4a5287c9d37c39d09d9bdc80846b744649 (patch) | |
| tree | 45c5fb9b0d4871b10d2f70d529ea703a37541c56 | |
| parent | zorro: Simplify remove callback (diff) | |
| download | wireguard-linux-fac58b4a5287c9d37c39d09d9bdc80846b744649.tar.xz wireguard-linux-fac58b4a5287c9d37c39d09d9bdc80846b744649.zip | |
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 <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20210730191035.1455248-5-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/zorro/zorro-driver.c | 7 | ||||
| -rw-r--r-- | include/linux/zorro.h | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c index ab06c9ce2c78..96f068830549 100644 --- 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 e2e4de188d84..db7416ed6057 100644 --- 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; |