The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bdfc2fc0c44dddaa77062d4a81836af93d72be9a
commit bdfc2fc0c44dddaa77062d4a81836af93d72be9a Author: John Baldwin <[email protected]> AuthorDate: 2022-04-08 00:01:29 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-04-08 00:01:29 +0000 pcm mss: Quiet unused variable warnings. - Remove dummy variable for a register read. Keep the register read despite the dubious comment. - Move all references to set_res under #if 0. --- sys/dev/sound/isa/mss.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c index b4e89d2a8041..d0740e59de04 100644 --- a/sys/dev/sound/isa/mss.c +++ b/sys/dev/sound/isa/mss.c @@ -1080,7 +1080,7 @@ static void opti931_intr(void *arg) { struct mss_info *mss = (struct mss_info *)arg; - u_char masked = 0, i11, mc11, c = 0; + u_char masked = 0, mc11, c = 0; u_char reason; /* b0 = playback, b1 = capture, b2 = timer */ int loops = 10; @@ -1092,7 +1092,7 @@ opti931_intr(void *arg) } #endif mss_lock(mss); - i11 = ad_read(mss, 11); /* XXX what's for ? */ + (void)ad_read(mss, 11); /* XXX what's for ? */ again: c = mc11 = FULL_DUPLEX(mss)? opti_rd(mss, 11) : 0xc; @@ -1272,7 +1272,10 @@ static int mss_probe(device_t dev) { u_char tmp, tmpx; - int flags, irq, drq, result = ENXIO, setres = 0; + int flags, irq, drq, result = ENXIO; +#if 0 + int setres = 0; +#endif struct mss_info *mss; if (isa_get_logicalid(dev)) return ENXIO; /* not yet */ @@ -1291,7 +1294,9 @@ mss_probe(device_t dev) BVDDB(printf("mss_probe: no address given, try 0x%x\n", 0x530)); mss->io_rid = 0; /* XXX verify this */ +#if 0 setres = 1; +#endif bus_set_resource(dev, SYS_RES_IOPORT, mss->io_rid, 0x530, 8); mss->io_base = bus_alloc_resource_anywhere(dev, SYS_RES_IOPORT,
