zorro: Simplify remove callback
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Fri, 30 Jul 2021 19:10:34 +0000 (21:10 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Aug 2021 12:37:04 +0000 (14:37 +0200)
The driver core only calls a remove callback when the device was
successfully bound (aka probed) before. So dev->driver is never NULL.

(And even if it was NULL, to_zorro_driver(NULL) isn't ...)

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/20210730191035.1455248-4-u.kleine-koenig@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/zorro/zorro-driver.c

index c18524b..ab06c9c 100644 (file)
@@ -67,11 +67,9 @@ static void zorro_device_remove(struct device *dev)
        struct zorro_dev *z = to_zorro_dev(dev);
        struct zorro_driver *drv = to_zorro_driver(dev->driver);
 
-       if (drv) {
-               if (drv->remove)
-                       drv->remove(z);
-               z->driver = NULL;
-       }
+       if (drv->remove)
+               drv->remove(z);
+       z->driver = NULL;
 }