[PATCH 06/33] hp100: use match_string() helper
From: Yisheng Xie <hidden>
Date: 2018-05-21 12:09:19
Also in:
lkml
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
match_string() returns the index of an array for a matching string, which can be used intead of open coded variant. Cc: Jaroslav Kysela <perex@perex.cz> Cc: netdev@vger.kernel.org Signed-off-by: Yisheng Xie <redacted> --- drivers/net/ethernet/hp/hp100.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/hp/hp100.c b/drivers/net/ethernet/hp/hp100.c
index c8c7ad2..84501b3 100644
--- a/drivers/net/ethernet/hp/hp100.c
+++ b/drivers/net/ethernet/hp/hp100.c@@ -335,7 +335,6 @@ static const char *hp100_read_id(int ioaddr) static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr) { const char *sig; - int i; if (!request_region(ioaddr, HP100_REGION_SIZE, "hp100")) goto err;
@@ -351,13 +350,7 @@ static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr) if (sig == NULL) goto err; - for (i = 0; i < ARRAY_SIZE(hp100_isa_tbl); i++) { - if (!strcmp(hp100_isa_tbl[i], sig)) - break; - - } - - if (i < ARRAY_SIZE(hp100_isa_tbl)) + if (match_string(hp100_isa_tbl, ARRAY_SIZE(hp100_isa_tbl), sig) >= 0) return hp100_probe1(dev, ioaddr, HP100_BUS_ISA, NULL); err: return -ENODEV;
--
1.7.12.4