From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun, 12 Jan 2020 16:49:47 +0000 (+0100)
Subject: zorro: Use zorro_match_device() helper in zorro_bus_match()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3d52910e2b8ae7483a17ee824fa0e4f18bd7e7d4;p=linux.git

zorro: Use zorro_match_device() helper in zorro_bus_match()

Make zorro_bus_match() use the existing zorro_match_device() helper,
instead of open-coding the same operation.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20200112164949.20196-4-geert@linux-m68k.org
---

diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index 67e6888055424..0dd7cbcec2b0d 100644
--- a/drivers/zorro/zorro-driver.c
+++ b/drivers/zorro/zorro-driver.c
@@ -133,12 +133,7 @@ static int zorro_bus_match(struct device *dev, struct device_driver *drv)
 	if (!ids)
 		return 0;
 
-	while (ids->id) {
-		if (ids->id == ZORRO_WILDCARD || ids->id == z->id)
-			return 1;
-		ids++;
-	}
-	return 0;
+	return !!zorro_match_device(ids, z);
 }
 
 static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env)