From c3f2d05727060ba4cca2b26bed476aa5be57e9cb Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Thu, 21 Apr 2016 15:24:21 +0000 Subject: [PATCH] siba(4): remove slightly used 'bound' variable. It can be replaced with nitems(). While here simplify the function Suggested by: jhb --- sys/dev/siba/siba.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/dev/siba/siba.c b/sys/dev/siba/siba.c index f0bcd9f2e9d..1c429a2f61c 100644 --- a/sys/dev/siba/siba.c +++ b/sys/dev/siba/siba.c @@ -337,22 +337,19 @@ siba_attach(device_t dev) static struct siba_devid * siba_dev_match(uint16_t vid, uint16_t devid, uint8_t rev) { - size_t i, bound; + size_t i; struct siba_devid *sd; - bound = sizeof(siba_devids) / sizeof(struct siba_devid); sd = &siba_devids[0]; - for (i = 0; i < bound; i++, sd++) { + for (i = 0; i < nitems(siba_devids); i++, sd++) { if (((vid == SIBA_VID_ANY) || (vid == sd->sd_vendor)) && ((devid == SIBA_DEVID_ANY) || (devid == sd->sd_device)) && ((rev == SIBA_REV_ANY) || (rev == sd->sd_rev) || (sd->sd_rev == SIBA_REV_ANY))) - break; + return(sd); } - if (i == bound) - sd = NULL; - return (sd); + return (NULL); } static int