git: 9b40b4faa7bd - stable/14 - sound: remove PCM_KLDSTRING() and fix status strings
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 30 Jan 2024 11:08:25 UTC
The branch stable/14 has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=9b40b4faa7bd79a4e840e5ed38c0915bf2c82fbb
commit 9b40b4faa7bd79a4e840e5ed38c0915bf2c82fbb
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2024-01-16 16:48:14 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2024-01-30 11:07:28 +0000
sound: remove PCM_KLDSTRING() and fix status strings
PCM_KLDSTRING() prints the kernel module associated with a given audio
device only when that module is not compiled in. Get rid of
PCM_KLDSTRING() altogether and print the driver name (even for modules
that are compiled in) instead, as it implies the module as well.
While here, convert all status strings to the following dmesg-like
format:
[<port|mem> <irq>] on <driver>
Sponsored by: The FreeBSD Foundation
MFC after: 2 weeks
Reviewed by: markj, imp
Differential Revision: https://reviews.freebsd.org/D43349
(cherry picked from commit 837cd192ebf2d0d4f5ded8883403ef11e6fa6438)
---
sys/dev/sound/pci/als4000.c | 5 +++--
sys/dev/sound/pci/atiixp.c | 4 ++--
sys/dev/sound/pci/cmi.c | 5 +++--
sys/dev/sound/pci/cs4281.c | 7 ++++---
sys/dev/sound/pci/csapcm.c | 5 +++--
sys/dev/sound/pci/emu10k1.c | 4 ++--
sys/dev/sound/pci/emu10kx-pcm.c | 3 ++-
sys/dev/sound/pci/envy24.c | 5 +++--
sys/dev/sound/pci/envy24ht.c | 5 +++--
sys/dev/sound/pci/es137x.c | 6 +++---
sys/dev/sound/pci/fm801.c | 7 ++++---
sys/dev/sound/pci/hda/hdaa.c | 5 ++---
sys/dev/sound/pci/hdspe-pcm.c | 4 ++--
sys/dev/sound/pci/ich.c | 5 +++--
sys/dev/sound/pci/maestro3.c | 6 +++---
sys/dev/sound/pci/neomagic.c | 5 +++--
sys/dev/sound/pci/solo.c | 5 +++--
sys/dev/sound/pci/t4dwave.c | 5 +++--
sys/dev/sound/pci/via8233.c | 4 ++--
sys/dev/sound/pci/via82c686.c | 4 ++--
sys/dev/sound/pci/vibes.c | 5 +++--
sys/dev/sound/pcm/sound.h | 6 ------
sys/dev/sound/usb/uaudio.c | 5 ++---
23 files changed, 60 insertions(+), 55 deletions(-)
diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c
index 5b7247517c13..b1376d2b6e5a 100644
--- a/sys/dev/sound/pci/als4000.c
+++ b/sys/dev/sound/pci/als4000.c
@@ -847,8 +847,9 @@ als_pci_attach(device_t dev)
pcm_addchan(dev, PCMDIR_PLAY, &alspchan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &alsrchan_class, sc);
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
- rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_als4000));
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
+ rman_get_start(sc->reg), rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return 0;
diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c
index 78be9475acd3..dcbf041f9605 100644
--- a/sys/dev/sound/pci/atiixp.c
+++ b/sys/dev/sound/pci/atiixp.c
@@ -1097,9 +1097,9 @@ atiixp_chip_post_init(void *arg)
"polling", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, sc->dev,
sizeof(sc->dev), sysctl_atiixp_polling, "I", "Enable polling mode");
- snprintf(status, SND_STATUSLEN, "at memory 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "mem 0x%jx irq %jd on %s",
rman_get_start(sc->reg), rman_get_start(sc->irq),
- PCM_KLDSTRING(snd_atiixp));
+ device_get_nameunit(device_get_parent(sc->dev)));
pcm_setstatus(sc->dev, status);
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
index 4fd6ac4c0a75..9a92066c51a4 100644
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -990,8 +990,9 @@ cmi_attach(device_t dev)
pcm_addchan(dev, PCMDIR_PLAY, &cmichan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &cmichan_class, sc);
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
- rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_cmi));
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
+ rman_get_start(sc->reg), rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
DEB(printf("cmi_attach: succeeded\n"));
diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c
index 25beb3f7fd0d..972b83efff8f 100644
--- a/sys/dev/sound/pci/cs4281.c
+++ b/sys/dev/sound/pci/cs4281.c
@@ -845,9 +845,10 @@ cs4281_pci_attach(device_t dev)
pcm_addchan(dev, PCMDIR_PLAY, &cs4281chan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &cs4281chan_class, sc);
- snprintf(status, SND_STATUSLEN, "at %s 0x%jx irq %jd %s",
- (sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
- rman_get_start(sc->reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_cs4281));
+ snprintf(status, SND_STATUSLEN, "%s 0x%jx irq %jd on %s",
+ (sc->regtype == SYS_RES_IOPORT)? "port" : "mem",
+ rman_get_start(sc->reg), rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return 0;
diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c
index 8715072ec0e5..71b9a0253cdb 100644
--- a/sys/dev/sound/pci/csapcm.c
+++ b/sys/dev/sound/pci/csapcm.c
@@ -819,8 +819,9 @@ pcmcsa_attach(device_t dev)
return (ENXIO);
}
- snprintf(status, SND_STATUSLEN, "at irq %jd %s",
- rman_get_start(resp->irq),PCM_KLDSTRING(snd_csa));
+ snprintf(status, SND_STATUSLEN, "irq %jd on %s",
+ rman_get_start(resp->irq),
+ device_get_nameunit(device_get_parent(dev)));
/* Enable interrupt. */
if (snd_setup_intr(dev, resp->irq, 0, csa_intr, csa, &csa->ih)) {
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
index 92937c2d0c42..0813f89c87b8 100644
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -2126,9 +2126,9 @@ emu_pci_attach(device_t dev)
goto bad;
}
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
rman_get_start(sc->reg), rman_get_start(sc->irq),
- PCM_KLDSTRING(snd_emu10k1));
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, sc, sc->nchans, gotmic ? 3 : 2)) goto bad;
for (i = 0; i < sc->nchans; i++)
diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c
index 661d65165190..b4633efdddc7 100644
--- a/sys/dev/sound/pci/emu10kx-pcm.c
+++ b/sys/dev/sound/pci/emu10kx-pcm.c
@@ -1477,7 +1477,8 @@ emu_pcm_attach(device_t dev)
if (route == RT_MCHRECORD)
pcm_addchan(dev, PCMDIR_REC, &emufxrchan_class, sc);
- snprintf(status, SND_STATUSLEN, "on %s", device_get_nameunit(device_get_parent(dev)));
+ snprintf(status, SND_STATUSLEN, "on %s",
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return (0);
diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c
index 24b5abc0eeb9..f7cc7ff5724d 100644
--- a/sys/dev/sound/pci/envy24.c
+++ b/sys/dev/sound/pci/envy24.c
@@ -2590,7 +2590,7 @@ envy24_pci_attach(device_t dev)
/* set status iformation */
snprintf(status, SND_STATUSLEN,
- "at io 0x%jx:%jd,0x%jx:%jd,0x%jx:%jd,0x%jx:%jd irq %jd",
+ "port 0x%jx:%jd,0x%jx:%jd,0x%jx:%jd,0x%jx:%jd irq %jd on %s",
rman_get_start(sc->cs),
rman_get_end(sc->cs) - rman_get_start(sc->cs) + 1,
rman_get_start(sc->ddma),
@@ -2599,7 +2599,8 @@ envy24_pci_attach(device_t dev)
rman_get_end(sc->ds) - rman_get_start(sc->ds) + 1,
rman_get_start(sc->mt),
rman_get_end(sc->mt) - rman_get_start(sc->mt) + 1,
- rman_get_start(sc->irq));
+ rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return 0;
diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c
index 6a3ef5afcf59..65c67b84ce53 100644
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -2496,12 +2496,13 @@ envy24ht_pci_attach(device_t dev)
/* set status iformation */
snprintf(status, SND_STATUSLEN,
- "at io 0x%jx:%jd,0x%jx:%jd irq %jd",
+ "port 0x%jx:%jd,0x%jx:%jd irq %jd on %s",
rman_get_start(sc->cs),
rman_get_end(sc->cs) - rman_get_start(sc->cs) + 1,
rman_get_start(sc->mt),
rman_get_end(sc->mt) - rman_get_start(sc->mt) + 1,
- rman_get_start(sc->irq));
+ rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return 0;
diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c
index 8c1c2b34e1cf..8f832d899dd3 100644
--- a/sys/dev/sound/pci/es137x.c
+++ b/sys/dev/sound/pci/es137x.c
@@ -1856,10 +1856,10 @@ es_pci_attach(device_t dev)
goto bad;
}
- snprintf(status, SND_STATUSLEN, "at %s 0x%jx irq %jd %s",
- (es->regtype == SYS_RES_IOPORT)? "io" : "memory",
+ snprintf(status, SND_STATUSLEN, "%s 0x%jx irq %jd on %s",
+ (es->regtype == SYS_RES_IOPORT)? "port" : "mem",
rman_get_start(es->reg), rman_get_start(es->irq),
- PCM_KLDSTRING(snd_es137x));
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, es, numplay, 1))
goto bad;
diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
index d7aa731175bb..fbde14f37afe 100644
--- a/sys/dev/sound/pci/fm801.c
+++ b/sys/dev/sound/pci/fm801.c
@@ -636,9 +636,10 @@ fm801_pci_attach(device_t dev)
goto oops;
}
- snprintf(status, 64, "at %s 0x%jx irq %jd %s",
- (fm801->regtype == SYS_RES_IOPORT)? "io" : "memory",
- rman_get_start(fm801->reg), rman_get_start(fm801->irq),PCM_KLDSTRING(snd_fm801));
+ snprintf(status, SND_STATUSLEN, "%s 0x%jx irq %jd on %s",
+ (fm801->regtype == SYS_RES_IOPORT)? "port" : "mem",
+ rman_get_start(fm801->reg), rman_get_start(fm801->irq),
+ device_get_nameunit(device_get_parent(dev)));
#define FM801_MAXPLAYCH 1
if (pcm_register(dev, fm801, FM801_MAXPLAYCH, 1)) goto oops;
diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c
index 1831ae0c1f19..e64eac6114e4 100644
--- a/sys/dev/sound/pci/hda/hdaa.c
+++ b/sys/dev/sound/pci/hda/hdaa.c
@@ -7114,9 +7114,8 @@ hdaa_pcm_attach(device_t dev)
hdaa_unlock(devinfo);
}
- snprintf(status, SND_STATUSLEN, "on %s %s",
- device_get_nameunit(device_get_parent(dev)),
- PCM_KLDSTRING(snd_hda));
+ snprintf(status, SND_STATUSLEN, "on %s",
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
return (0);
diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c
index d9d40c9877ad..0360e84fbe91 100644
--- a/sys/dev/sound/pci/hdspe-pcm.c
+++ b/sys/dev/sound/pci/hdspe-pcm.c
@@ -1043,10 +1043,10 @@ hdspe_pcm_attach(device_t dev)
scp->chnum++;
}
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
rman_get_start(scp->sc->cs),
rman_get_start(scp->sc->irq),
- PCM_KLDSTRING(snd_hdspe));
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
mixer_init(dev, &hdspemixer_class, scp);
diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 70a9440d9b23..fbde0accfd28 100644
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -686,9 +686,10 @@ ich_setstatus(struct sc_info *sc)
char status[SND_STATUSLEN];
snprintf(status, SND_STATUSLEN,
- "at io 0x%jx, 0x%jx irq %jd bufsz %u %s",
+ "port 0x%jx,0x%jx irq %jd on %s",
rman_get_start(sc->nambar), rman_get_start(sc->nabmbar),
- rman_get_start(sc->irq), sc->bufsz,PCM_KLDSTRING(snd_ich));
+ rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(sc->dev)));
if (bootverbose && (sc->flags & ICH_DMA_NOCACHE))
device_printf(sc->dev,
diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c
index 9ba83fe4de11..6dd54a66f683 100644
--- a/sys/dev/sound/pci/maestro3.c
+++ b/sys/dev/sound/pci/maestro3.c
@@ -1439,10 +1439,10 @@ m3_pci_attach(device_t dev)
goto bad;
}
}
- snprintf(status, SND_STATUSLEN, "at %s 0x%jx irq %jd %s",
- (sc->regtype == SYS_RES_IOPORT)? "io" : "memory",
+ snprintf(status, SND_STATUSLEN, "%s 0x%jx irq %jd on %s",
+ (sc->regtype == SYS_RES_IOPORT)? "port" : "mem",
rman_get_start(sc->reg), rman_get_start(sc->irq),
- PCM_KLDSTRING(snd_maestro3));
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_setstatus(dev, status)) {
device_printf(dev, "attach: pcm_setstatus error\n");
goto bad;
diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 1b325205da5f..25273633ff18 100644
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -702,9 +702,10 @@ nm_pci_attach(device_t dev)
goto bad;
}
- snprintf(status, SND_STATUSLEN, "at memory 0x%jx, 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "mem 0x%jx,0x%jx irq %jd on %s",
rman_get_start(sc->buf), rman_get_start(sc->reg),
- rman_get_start(sc->irq),PCM_KLDSTRING(snd_neomagic));
+ rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, sc, 1, 1)) goto bad;
pcm_addchan(dev, PCMDIR_REC, &nmchan_class, sc);
diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
index d626da4fbb68..bee79e723696 100644
--- a/sys/dev/sound/pci/solo.c
+++ b/sys/dev/sound/pci/solo.c
@@ -1022,9 +1022,10 @@ ess_attach(device_t dev)
if (mixer_init(dev, &solomixer_class, sc))
goto no;
- snprintf(status, SND_STATUSLEN, "at io 0x%jx,0x%jx,0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "port 0x%jx,0x%jx,0x%jx irq %jd on %s",
rman_get_start(sc->io), rman_get_start(sc->sb), rman_get_start(sc->vc),
- rman_get_start(sc->irq),PCM_KLDSTRING(snd_solo));
+ rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, sc, 1, 1))
goto no;
diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c
index 250b04426482..653e610febbe 100644
--- a/sys/dev/sound/pci/t4dwave.c
+++ b/sys/dev/sound/pci/t4dwave.c
@@ -917,8 +917,9 @@ tr_pci_attach(device_t dev)
goto bad;
}
- snprintf(status, 64, "at io 0x%jx irq %jd %s",
- rman_get_start(tr->reg), rman_get_start(tr->irq),PCM_KLDSTRING(snd_t4dwave));
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
+ rman_get_start(tr->reg), rman_get_start(tr->irq),
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, tr, dacn, 1))
goto bad;
diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c
index 517e80fadb4f..9f3b312e4365 100644
--- a/sys/dev/sound/pci/via8233.c
+++ b/sys/dev/sound/pci/via8233.c
@@ -1347,9 +1347,9 @@ via_attach(device_t dev)
ac97_setextmode(via->codec, ext);
}
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
rman_get_start(via->reg), rman_get_start(via->irq),
- PCM_KLDSTRING(snd_via8233));
+ device_get_nameunit(device_get_parent(dev)));
/* Register */
if (pcm_register(dev, via, via_dxs_chnum + via_sgd_chnum, NWRCHANS))
diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c
index 266441a938c6..44f846b684d7 100644
--- a/sys/dev/sound/pci/via82c686.c
+++ b/sys/dev/sound/pci/via82c686.c
@@ -580,9 +580,9 @@ via_attach(device_t dev)
NSEGS * sizeof(struct via_dma_op), dma_cb, via, 0) != 0)
goto bad;
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
rman_get_start(via->reg), rman_get_start(via->irq),
- PCM_KLDSTRING(snd_via82c686));
+ device_get_nameunit(device_get_parent(dev)));
/* Register */
if (pcm_register(dev, via, 1, 1)) goto bad;
diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
index 538aa961d987..e587f0113b5d 100644
--- a/sys/dev/sound/pci/vibes.c
+++ b/sys/dev/sound/pci/vibes.c
@@ -874,8 +874,9 @@ sv_attach(device_t dev) {
pcm_addchan(dev, PCMDIR_PLAY, &svpchan_class, sc);
pcm_addchan(dev, PCMDIR_REC, &svrchan_class, sc);
- snprintf(status, SND_STATUSLEN, "at io 0x%jx irq %jd %s",
- rman_get_start(sc->enh_reg), rman_get_start(sc->irq),PCM_KLDSTRING(snd_vibes));
+ snprintf(status, SND_STATUSLEN, "port 0x%jx irq %jd on %s",
+ rman_get_start(sc->enh_reg), rman_get_start(sc->irq),
+ device_get_nameunit(device_get_parent(dev)));
pcm_setstatus(dev, status);
DEB(printf("sv_attach: succeeded\n"));
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 5981266116fb..5b366a62630c 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -598,12 +598,6 @@ int sound_oss_card_info(oss_card_info *);
PCM_GIANT_EXIT(x); \
} while (0)
-#ifdef KLD_MODULE
-#define PCM_KLDSTRING(a) ("kld " # a)
-#else
-#define PCM_KLDSTRING(a) ""
-#endif
-
#endif /* _KERNEL */
#endif /* _OS_H_ */
diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c
index 3237093bcbfa..36985d4666a4 100644
--- a/sys/dev/sound/usb/uaudio.c
+++ b/sys/dev/sound/usb/uaudio.c
@@ -1204,9 +1204,8 @@ uaudio_attach_sub(device_t dev, kobj_class_t mixer_class, kobj_class_t chan_clas
usb_get_product(sc->sc_udev));
device_set_desc_copy(dev, desc);
- snprintf(status, sizeof(status), "at %s %s",
- device_get_nameunit(device_get_parent(dev)),
- PCM_KLDSTRING(snd_uaudio));
+ snprintf(status, sizeof(status), "on %s",
+ device_get_nameunit(device_get_parent(dev)));
if (pcm_register(dev, sc,
(sc->sc_play_chan[i].num_alt > 0) ? 1 : 0,