Index: cam_periph.c =================================================================== RCS file: /home/ncvs/src/sys/cam/cam_periph.c,v retrieving revision 1.39 diff -u -r1.39 cam_periph.c --- cam_periph.c 2002/06/07 23:51:30 1.39 +++ cam_periph.c 2002/08/20 06:57:36 @@ -363,37 +363,27 @@ target_id_t target, lun_id_t lun) { u_int unit; - int hit, i, val, dunit; + int i, val, dunit; const char *dname, *strval; char pathbuf[32], *periph_name; unit = 0; - hit = 0; - periph_name = p_drv->driver_name; snprintf(pathbuf, sizeof(pathbuf), "scbus%d", pathid); i = 0; dname = periph_name; while ((resource_find_dev(&i, dname, &dunit, NULL, NULL)) == 0) { - if (resource_string_value(dname, dunit, "at", &strval) == 0) { + if (resource_string_value(dname, dunit, "at", &strval) == 0) if (strcmp(strval, pathbuf) != 0) continue; - hit++; - } - if (resource_int_value(dname, dunit, "target", &val) == 0) { + if (resource_int_value(dname, dunit, "target", &val) == 0) if (val != target) continue; - hit++; - } - if (resource_int_value(dname, dunit, "lun", &val) == 0) { + if (resource_int_value(dname, dunit, "lun", &val) == 0) if (val != lun) continue; - hit++; - } - if (hit != 0) { - unit = dunit; - break; - } + unit = dunit; + break; } /*