Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 21 Feb 2020 22:11:14 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r358232 - stable/12/sys/arm/allwinner/clkng
Message-ID:  <202002212211.01LMBEGT011552@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: dim
Date: Fri Feb 21 22:11:14 2020
New Revision: 358232
URL: https://svnweb.freebsd.org/changeset/base/358232

Log:
  MFC r358074:
  
  Fix the following -Werror warning from clang 10.0.0:
  
  sys/arm/allwinner/clkng/aw_clk_mipi.c:144:6: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation]
                                          m++;
                                          ^
  sys/arm/allwinner/clkng/aw_clk_mipi.c:142:5: note: previous statement is here
                                  if (best == *fout)
                                  ^
  
  Move the increment operations into the for loop headers instead.
  
  Discussed with:	manu

Modified:
  stable/12/sys/arm/allwinner/clkng/aw_clk_mipi.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm/allwinner/clkng/aw_clk_mipi.c
==============================================================================
--- stable/12/sys/arm/allwinner/clkng/aw_clk_mipi.c	Fri Feb 21 22:08:45 2020	(r358231)
+++ stable/12/sys/arm/allwinner/clkng/aw_clk_mipi.c	Fri Feb 21 22:11:14 2020	(r358232)
@@ -129,9 +129,9 @@ aw_clk_mipi_find_best(struct aw_clk_mipi_sc *sc, uint6
 	*factor_k = 0;
 	*factor_m = 0;
 
-	for (n = aw_clk_factor_get_min(&sc->n); n <= aw_clk_factor_get_max(&sc->n); ) {
-		for (k = aw_clk_factor_get_min(&sc->k); k <= aw_clk_factor_get_max(&sc->k); ) {
-			for (m = aw_clk_factor_get_min(&sc->m); m <= aw_clk_factor_get_max(&sc->m); ) {
+	for (n = aw_clk_factor_get_min(&sc->n); n <= aw_clk_factor_get_max(&sc->n); n++) {
+		for (k = aw_clk_factor_get_min(&sc->k); k <= aw_clk_factor_get_max(&sc->k); k++) {
+			for (m = aw_clk_factor_get_min(&sc->m); m <= aw_clk_factor_get_max(&sc->m); m++) {
 				cur = (fparent * n * k) / m;
 				if ((*fout - cur) < (*fout - best)) {
 					best = cur;
@@ -141,11 +141,8 @@ aw_clk_mipi_find_best(struct aw_clk_mipi_sc *sc, uint6
 				}
 				if (best == *fout)
 					return (best);
-					m++;
 			}
-				k++;
 		}
-			n++;
 	}
 
 	return best;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002212211.01LMBEGT011552>