Commit fac58b4a authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

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: default avatarUwe 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 18d214cc

drivers/zorro/zorro-driver.c

+2 −5
Original line number Diff line number Diff line
@@ -47,17 +47,15 @@ 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;

}

include/linux/zorro.h

+0 −1
Original line number Diff line number Diff line
@@ -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;