From owner-svn-src-stable-11@freebsd.org Sat Apr 25 13:18:31 2020 Return-Path: Delivered-To: svn-src-stable-11@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9B4112B1523; Sat, 25 Apr 2020 13:18:31 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 498Wng3fg6z448Z; Sat, 25 Apr 2020 13:18:31 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 779FB827E; Sat, 25 Apr 2020 13:18:31 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03PDIVJH082716; Sat, 25 Apr 2020 13:18:31 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03PDIUFn082713; Sat, 25 Apr 2020 13:18:30 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202004251318.03PDIUFn082713@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 25 Apr 2020 13:18:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r360305 - in stable: 11/sys/dev/mrsas 11/sys/dev/sound/pci 12/sys/dev/mrsas 12/sys/dev/sound/pci X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: in stable: 11/sys/dev/mrsas 11/sys/dev/sound/pci 12/sys/dev/mrsas 12/sys/dev/sound/pci X-SVN-Commit-Revision: 360305 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2020 13:18:31 -0000 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); }