Introduce findchrmajor() and use where appropriate.

natano · natano · commit 4d83da2a9400 · 2015-01-10T18:10:50.000+01:00
diff --git a/sys/arch/amd64/amd64/wscons_machdep.c b/sys/arch/amd64/amd64/wscons_machdep.c
@@ -82,16 +82,9 @@ wscnprobe(struct consdev *cp)
 {
 	int maj;
 
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++) {
-		if (cdevsw[maj].d_open == wsdisplayopen)
-			break;
-	}
-
-	if (maj == nchrdev) {
-		/* we are not in cdevsw[], give up */
+	maj = findchrmajor(wsdisplayopen);
+	if (maj == -1)
 		panic("wsdisplay is not in cdevsw[]");
-	}
 
 	cp->cn_dev = makedev(maj, 0);
 	cp->cn_pri = CN_MIDPRI;
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
@@ -516,10 +516,7 @@ audiodetach(struct device *self, int flags)
 	audio_free_ring(sc, &sc->sc_pr);
 	audio_free_ring(sc, &sc->sc_rr);
 
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == audioopen)
-			break;
+	maj = findchrmajor(audioopen);
 
 	/* Nuke the vnodes for any open instances (calls close). */
 	mn = self->dv_unit;
diff --git a/sys/dev/gpio/gpio.c b/sys/dev/gpio/gpio.c
@@ -110,10 +110,7 @@ gpio_detach(struct device *self, int flags)
 {
 	int maj, mn;
 
-	/* Locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == gpioopen)
-			break;
+	maj = findchrmajor(gpioopen);
 
 	/* Nuke the vnodes for any open instances (calls close) */
 	mn = self->dv_unit;
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
@@ -201,10 +201,7 @@ com_detach(struct device *self, int flags)
 
 	sc->sc_swflags |= COM_SW_DEAD;
 
-	/* Locate the major number. */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == comopen)
-			break;
+	maj = findchrmajor(comopen);
 
 	/* Nuke the vnodes for any open instances. */
 	mn = self->dv_unit;
@@ -1422,10 +1419,7 @@ comcnprobe(struct consdev *cp)
 	if (!found)
 		return;
 
-	/* Locate the major number. */
-	for (commajor = 0; commajor < nchrdev; commajor++)
-		if (cdevsw[commajor].d_open == comopen)
-			break;
+	commajor = findchrmajor(comopen);
 
 	/* Initialize required fields. */
 	cp->cn_dev = makedev(commajor, comconsunit);
@@ -1807,12 +1801,9 @@ com_attach_subr(struct com_softc *sc)
 	if (ISSET(sc->sc_hwflags, COM_HW_CONSOLE)) {
 		int maj;
 
-		/* locate the major number */
-		for (maj = 0; maj < nchrdev; maj++)
-			if (cdevsw[maj].d_open == comopen)
-				break;
+		maj = findchrmajor(comopen);
 
-		if (maj < nchrdev && cn_tab->cn_dev == NODEV)
+		if (maj != -1 && cn_tab->cn_dev == NODEV)
 			cn_tab->cn_dev = makedev(maj, sc->sc_dev.dv_unit);
 
 		printf("%s: console\n", sc->sc_dev.dv_xname);
diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c
@@ -872,12 +872,8 @@ cztty_findmajor(void)
 {
 	int	maj;
 
-	for (maj = 0; maj < nchrdev; maj++) {
-		if (cdevsw[maj].d_open == czttyopen)
-			break;
-	}
-
-	return (maj == nchrdev) ? 0 : maj;
+	maj = findchrmajor(czttyopen);
+	return (maj == -1) ? 0 : maj;
 }
 
 /*
diff --git a/sys/dev/radio.c b/sys/dev/radio.c
@@ -176,10 +176,7 @@ radiodetach(struct device *self, int flags)
 	/*struct radio_softc *sc = (struct radio_softc *)self;*/
 	int maj, mn;
 
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == radioopen)
-			break;
+	maj = findchrmajor(radioopen);
 
 	/* Nuke the vnodes for any open instances (calls close). */
 	mn = self->dv_unit;
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
@@ -255,10 +255,7 @@ ucom_detach(struct device *self, int flags)
 	}
 	splx(s);
 
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == ucomopen)
-			break;
+	maj = findchrmajor(ucomopen);
 
 	/* Nuke the vnodes for any open instances. */
 	mn = self->dv_unit;
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
@@ -765,10 +765,7 @@ ugen_detach(struct device *self, int flags)
 	}
 	splx(s);
 
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == ugenopen)
-			break;
+	maj = findchrmajor(ugenopen);
 
 	/* Nuke the vnodes for any open instances (calls close). */
 	mn = self->dv_unit * USB_MAX_ENDPOINTS;
diff --git a/sys/dev/usb/uhid.c b/sys/dev/usb/uhid.c
@@ -165,10 +165,7 @@ uhid_detach(struct device *self, int flags)
 		splx(s);
 	}
 
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == uhidopen)
-			break;
+	maj = findchrmajor(uhidopen);
 
 	/* Nuke the vnodes for any open instances (calls close). */
 	mn = self->dv_unit;
diff --git a/sys/dev/usb/ulpt.c b/sys/dev/usb/ulpt.c
@@ -378,10 +378,7 @@ ulpt_detach(struct device *self, int flags)
 	}
 	splx(s);
 
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == ulptopen)
-			break;
+	maj = findchrmajor(ulptopen);
 
 	/* Nuke the vnodes for any open instances (calls close). */
 	mn = self->dv_unit;
diff --git a/sys/dev/video.c b/sys/dev/video.c
@@ -439,10 +439,7 @@ videodetach(struct device *self, int flags)
 	if (sc->sc_fbuffer != NULL)
 		free(sc->sc_fbuffer, M_DEVBUF, 0);
 
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == videoopen)
-			break;
+	maj = findchrmajor(videoopen);
 
 	/* Nuke the vnodes for any open instances (calls close). */
 	mn = self->dv_unit;
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
@@ -435,10 +435,8 @@ wsdisplay_closescreen(struct wsdisplay_softc *sc, struct wsscreen *scr)
 		(*linesw[tp->t_line].l_modem)(tp, 0);
 	}
 
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == wsdisplayopen)
-			break;
+	maj = findchrmajor(wsdisplayopen);
+
 	/* locate the screen index */
 	for (idx = 0; idx < WSDISPLAY_MAXSCREEN; idx++)
 		if (scr == sc->sc_scr[idx])
@@ -545,11 +543,7 @@ wsdisplay_emul_attach(struct device *parent, struct device *self, void *aux)
 	if (ap->console && cn_tab == &wsdisplay_cons) {
 		int maj;
 
-		/* locate the major number */
-		for (maj = 0; maj < nchrdev; maj++)
-			if (cdevsw[maj].d_open == wsdisplayopen)
-				break;
-
+		maj = findchrmajor(wsdisplayopen);
 		cn_tab->cn_dev = makedev(maj, WSDISPLAYMINOR(self->dv_unit, 0));
 	}
 }
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
@@ -626,10 +626,7 @@ wskbd_detach(struct device  *self, int flags)
 
 	free(sc->sc_map, M_DEVBUF, 0);
 
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == wskbdopen)
-			break;
+	maj = findchrmajor(wskbdopen);
 
 	/* Nuke the vnodes for any open instances. */
 	mn = self->dv_unit;
diff --git a/sys/dev/wscons/wsmouse.c b/sys/dev/wscons/wsmouse.c
@@ -271,10 +271,7 @@ wsmouse_detach(struct device *self, int flags)
 		splx(s);
 	}
 
-	/* locate the major number */
-	for (maj = 0; maj < nchrdev; maj++)
-		if (cdevsw[maj].d_open == wsmouseopen)
-			break;
+	maj = findchrmajor(wsmouseopen);
 
 	/* Nuke the vnodes for any open instances (calls close). */
 	mn = self->dv_unit;
diff --git a/sys/kern/subr_xxx.c b/sys/kern/subr_xxx.c
@@ -152,6 +152,17 @@ blktochr(dev_t dev)
 	return (NODEV);
 }
 
+int
+findchrmajor(int (*open)(dev_t, int, int, struct proc *))
+{
+	int cmaj;
+
+	for (cmaj = 0; cmaj < nchrdev; cmaj++)
+		if (cdevsw[cmaj].d_open == open)
+			return (cmaj);
+	return (-1);
+}
+
 /*
  * Check that we're in a context where it's okay to sleep.
  */
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
@@ -1037,17 +1037,13 @@ ptm_vn_open(struct nameidata *ndp)
 void
 ptmattach(int n)
 {
-	/* find the major and minor of the pty devices */
-	int i;
-
-	for (i = 0; i < nchrdev; i++)
-		if (cdevsw[i].d_open == ptsopen)
-			break;
+	int maj;
 
-	if (i == nchrdev)
+	maj = findchrmajor(ptsopen);
+	if (maj == -1)
 		panic("ptmattach: Can't find pty slave in cdevsw");
 
-	pts_major = i;
+	pts_major = maj;
 }
 
 int
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
@@ -1456,10 +1456,7 @@ bpfdetach(struct ifnet *ifp)
 		if (bp->bif_ifp == ifp) {
 			*pbp = nbp;
 
-			/* Locate the major number. */
-			for (maj = 0; maj < nchrdev; maj++)
-				if (cdevsw[maj].d_open == bpfopen)
-					break;
+			maj = findchrmajor(bpfopen);
 
 			for (bd = bp->bif_dlist; bd; bd = bp->bif_dlist) {
 				struct bpf_d *d;
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
@@ -508,6 +508,7 @@ struct bdevsw *bdevsw_lookup(dev_t);
 struct cdevsw *cdevsw_lookup(dev_t);
 dev_t	chrtoblk(dev_t);
 dev_t	blktochr(dev_t);
+int	findchrmajor(int (*)(dev_t, int, int, struct proc *));
 int	iskmemdev(dev_t);
 int	iszerodev(dev_t);
 dev_t	getnulldev(void);

Original file line number	Diff line number	Diff line change
`@@ -872,12 +872,8 @@ cztty_findmajor(void)`
`872`	`872`	`{`
`873`	`873`	`int maj;`
`874`	`874`
`875`		`- for (maj = 0; maj < nchrdev; maj++) {`
`876`		`- if (cdevsw[maj].d_open == czttyopen)`
`877`		`- break;`
`878`		`- }`
`879`		`-`
`880`		`- return (maj == nchrdev) ? 0 : maj;`
	`875`	`+ maj = findchrmajor(czttyopen);`
	`876`	`+ return (maj == -1) ? 0 : maj;`
`881`	`877`	`}`
`882`	`878`
`883`	`879`	`/*`