From owner-svn-src-all@freebsd.org Wed Jul 3 19:07:43 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 93D6415DDB73; Wed, 3 Jul 2019 19:07:43 +0000 (UTC) (envelope-from jhibbits@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 3919A8B1AC; Wed, 3 Jul 2019 19:07:43 +0000 (UTC) (envelope-from jhibbits@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 0EFBE18043; Wed, 3 Jul 2019 19:07:43 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x63J7gq5052517; Wed, 3 Jul 2019 19:07:42 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x63J7gKB052515; Wed, 3 Jul 2019 19:07:42 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201907031907.x63J7gKB052515@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Wed, 3 Jul 2019 19:07:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r349674 - stable/12/sys/powerpc/cpufreq X-SVN-Group: stable-12 X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: stable/12/sys/powerpc/cpufreq X-SVN-Commit-Revision: 349674 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3919A8B1AC X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.958,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Jul 2019 19:07:43 -0000 Author: jhibbits Date: Wed Jul 3 19:07:42 2019 New Revision: 349674 URL: https://svnweb.freebsd.org/changeset/base/349674 Log: MFC r344915: powerpc: Fix cpufreq statement scoping The second statements on the lines are not guarded by the `if' condition. This triggers a warning with newer gcc. It's relatively harmless given the usage, but incorrect. Instead, wrap the statements so they're properly guarded. Modified: stable/12/sys/powerpc/cpufreq/dfs.c stable/12/sys/powerpc/cpufreq/pcr.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/powerpc/cpufreq/dfs.c ============================================================================== --- stable/12/sys/powerpc/cpufreq/dfs.c Wed Jul 3 19:01:41 2019 (r349673) +++ stable/12/sys/powerpc/cpufreq/dfs.c Wed Jul 3 19:07:42 2019 (r349674) @@ -157,8 +157,10 @@ dfs_settings(device_t dev, struct cf_setting *sets, in sets[0].freq = 10000; sets[0].dev = dev; sets[1].freq = 5000; sets[1].dev = dev; - if (sc->dfs4) - sets[2].freq = 2500; sets[2].dev = dev; + if (sc->dfs4) { + sets[2].freq = 2500; + sets[2].dev = dev; + } *count = states; return (0); Modified: stable/12/sys/powerpc/cpufreq/pcr.c ============================================================================== --- stable/12/sys/powerpc/cpufreq/pcr.c Wed Jul 3 19:01:41 2019 (r349673) +++ stable/12/sys/powerpc/cpufreq/pcr.c Wed Jul 3 19:07:42 2019 (r349674) @@ -251,8 +251,10 @@ pcr_settings(device_t dev, struct cf_setting *sets, in sets[0].freq = 10000; sets[0].dev = dev; sets[1].freq = 5000; sets[1].dev = dev; - if (sc->nmodes > 2) - sets[2].freq = 2500; sets[2].dev = dev; + if (sc->nmodes > 2) { + sets[2].freq = 2500; + sets[2].dev = dev; + } *count = sc->nmodes; return (0);