svn commit: r360305 - in stable: 11/sys/dev/mrsas 11/sys/dev/sound/pci 12/sys/dev/mrsas 12/sys/dev/sound/pci
Dimitry Andric
dim at FreeBSD.org
Sat Apr 25 13:18:31 UTC 2020
Author: dim
Date: Sat Apr 25 13:18:29 2020
New Revision: 360305
URL: https://svnweb.freebsd.org/changeset/base/360305
Log:
MFC r357146 (partial, by jhb):
Fix some misleading indentation warnings reported by recent clang.
These should not be any functional change. While the change in
emul10kx-pcm.c looks like a real bug fix (as opposed to inconsistent
whitespace), the extra statements were not harmful.
Reviewed by: kib
Sponsored by: DARPA
Differential Revision: https://reviews.freebsd.org/D23363
Modified:
stable/11/sys/dev/mrsas/mrsas_cam.c
stable/11/sys/dev/sound/pci/emu10k1.c
stable/11/sys/dev/sound/pci/emu10kx-pcm.c
Directory Properties:
stable/11/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/12/sys/dev/mrsas/mrsas_cam.c
stable/12/sys/dev/sound/pci/emu10k1.c
stable/12/sys/dev/sound/pci/emu10kx-pcm.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/11/sys/dev/mrsas/mrsas_cam.c
==============================================================================
--- stable/11/sys/dev/mrsas/mrsas_cam.c Sat Apr 25 13:14:06 2020 (r360304)
+++ stable/11/sys/dev/mrsas/mrsas_cam.c Sat Apr 25 13:18:29 2020 (r360305)
@@ -1909,13 +1909,14 @@ mrsas_track_scsiio(struct mrsas_softc *sc, target_id_t
for (i = 0 ; i < sc->max_fw_cmds; i++) {
mpt_cmd = sc->mpt_cmd_list[i];
- /*
- * Check if the target_id and bus_id is same as the timeout IO
- */
- if (mpt_cmd->ccb_ptr) {
- /* bus_id = 1 denotes a VD */
- if (bus_id == 1)
- tgt_id = (mpt_cmd->ccb_ptr->ccb_h.target_id - (MRSAS_MAX_PD - 1));
+ /*
+ * Check if the target_id and bus_id is same as the timeout IO
+ */
+ if (mpt_cmd->ccb_ptr) {
+ /* bus_id = 1 denotes a VD */
+ if (bus_id == 1)
+ tgt_id =
+ (mpt_cmd->ccb_ptr->ccb_h.target_id - (MRSAS_MAX_PD - 1));
if (mpt_cmd->ccb_ptr->cpi.bus_id == bus_id &&
mpt_cmd->ccb_ptr->ccb_h.target_id == tgt_id) {
Modified: stable/11/sys/dev/sound/pci/emu10k1.c
==============================================================================
--- stable/11/sys/dev/sound/pci/emu10k1.c Sat Apr 25 13:14:06 2020 (r360304)
+++ stable/11/sys/dev/sound/pci/emu10k1.c Sat Apr 25 13:18:29 2020 (r360305)
@@ -1255,11 +1255,12 @@ emu_intr(void *data)
#endif
}
- if (stat & EMU_IPR_MIDIRECVBUFE)
- if (sc->mpu_intr) {
- (sc->mpu_intr)(sc->mpu);
- ack |= EMU_IPR_MIDIRECVBUFE | EMU_IPR_MIDITRANSBUFE;
- }
+ if (stat & EMU_IPR_MIDIRECVBUFE) {
+ if (sc->mpu_intr) {
+ (sc->mpu_intr)(sc->mpu);
+ ack |= EMU_IPR_MIDIRECVBUFE | EMU_IPR_MIDITRANSBUFE;
+ }
+ }
if (stat & ~ack)
device_printf(sc->dev, "dodgy irq: %x (harmless)\n",
stat & ~ack);
Modified: stable/11/sys/dev/sound/pci/emu10kx-pcm.c
==============================================================================
--- stable/11/sys/dev/sound/pci/emu10kx-pcm.c Sat Apr 25 13:14:06 2020 (r360304)
+++ stable/11/sys/dev/sound/pci/emu10kx-pcm.c Sat Apr 25 13:18:29 2020 (r360305)
@@ -261,11 +261,12 @@ emu_dspmixer_uninit(struct snd_mixer *m)
/* drop submixer for AC97 codec */
sc = mix_getdevinfo(m);
- if (sc->sm != NULL)
+ if (sc->sm != NULL) {
err = mixer_delete(sc->sm);
if (err)
return (err);
sc->sm = NULL;
+ }
return (0);
}
More information about the svn-src-all
mailing list