git: 30711541bac9 - stable/13 - emu10kx-pci: eliminate write only variable r

The branch stable/13 has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=30711541bac93e8dc64b87ed65fcb7b9b1e80691

commit 30711541bac93e8dc64b87ed65fcb7b9b1e80691
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2022-07-08 17:53:32 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2022-10-02 04:25:55 +0000

    emu10kx-pci: eliminate write only variable r
    
    Sponsored by:           Netflix
    
    (cherry picked from commit 451f54707a614757e2a0093876e30b68247a41da)
---
 sys/dev/sound/pci/emu10kx-pcm.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/dev/sound/pci/emu10kx-pcm.c b/sys/dev/sound/pci/emu10kx-pcm.c
index 4f50ffd1f74f..5f66799ab902 100644
--- a/sys/dev/sound/pci/emu10kx-pcm.c
+++ b/sys/dev/sound/pci/emu10kx-pcm.c
@@ -1298,17 +1298,17 @@ emu_pcm_uninit(struct emu_pcm_info *sc __unused)
 static int
 emu_pcm_probe(device_t dev)
 {
-	uintptr_t func, route, r;
+	uintptr_t func, route;
 	const char *rt;
 	char buffer[255];
 
-	r = BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_FUNC, &func);
+	BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_FUNC, &func);
 
 	if (func != SCF_PCM)
 		return (ENXIO);
 
 	rt = "UNKNOWN";
-	r = BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ROUTE, &route);
+	BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ROUTE, &route);
 	switch (route) {
 	case RT_FRONT:
 		rt = "front";
@@ -1342,7 +1342,7 @@ emu_pcm_attach(device_t dev)
 	unsigned int i;
 	char status[SND_STATUSLEN];
 	uint32_t inte, ipr;
-	uintptr_t route, r, ivar;
+	uintptr_t route, ivar;
 
 	sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO);
 	sc->card = (struct emu_sc_info *)(device_get_softc(device_get_parent(dev)));
@@ -1355,10 +1355,10 @@ emu_pcm_attach(device_t dev)
 	sc->lock = snd_mtxcreate(device_get_nameunit(dev), "snd_emu10kx pcm softc");
 	sc->dev = dev;
 
-	r = BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ISEMU10K1, &ivar);
+	BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ISEMU10K1, &ivar);
 	sc->is_emu10k1 = ivar ? 1 : 0;
 
-	r = BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_MCH_DISABLED, &ivar);
+	BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_MCH_DISABLED, &ivar);
 	sc->mch_disabled = ivar ? 1 : 0;
 
 	sc->codec = NULL;
@@ -1381,7 +1381,7 @@ emu_pcm_attach(device_t dev)
 	sc->emu10k1_volcache[1][0] = 75;
 	sc->emu10k1_volcache[0][1] = 75;
 	sc->emu10k1_volcache[1][1] = 75;
-	r = BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ROUTE, &route);
+	BUS_READ_IVAR(device_get_parent(dev), dev, EMU_VAR_ROUTE, &route);
 	sc->route = route;
 	switch (route) {
 	case RT_FRONT: