treewide: Convert comma separated statements

Commas are not how statements are terminated.
Always use semicolons and braces if necessary.

Signed-off-by Joe Perches <[email protected]>

---
 Documentation/process/coding-style.rst | 17 +++++++++++++++++

 1 file changed, 17 insertions(+)

Documentation/process/coding-style.rst +0 -0

index 98227226c4e5..a1e061149e0d 100644
@@ -69,9 +69,26 @@ something to hide:
  	if (condition) do_this;
  	  do_something_everytime;

Documentation/process/coding-style.rst +16 -0

+Don't use commas to avoid using braces:
+
+.. code-block:: c
+
+	if (condition)
+		do_this(), do_that();
+
+Always uses braces for multiple statements:
+
+.. code-block:: c
+
+	if (condition) {
+		do_this();
+		do_that();
+	}
+

 Don't put multiple assignments on a single line either. Kernel coding style is super simple. Avoid tricky expressions.

+
 Outside of comments, documentation and except in Kconfig, spaces are never used for indentation, and the above example is deliberately broken.

Quoted 2 lines · Joe Perches

Commas are not how statements are terminated.
Always use semicolons and braces if necessary.

ping?

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 arch/alpha/kernel/pci_iommu.c      |  8 +++++---
 arch/alpha/oprofile/op_model_ev4.c | 22 ++++++++++++++--------
 arch/alpha/oprofile/op_model_ev5.c |  8 +++++---
 3 files changed, 24 insertions(+), 14 deletions(-)

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---

 arch/alpha/kernel/pci_iommu.c      |  8 +++++---
 arch/alpha/oprofile/op_model_ev4.c | 22 ++++++++++++++--------
 arch/alpha/oprofile/op_model_ev5.c |  8 +++++---
 3 files changed, 24 insertions(+), 14 deletions(-)

arch/alpha/kernel/pci_iommu.c +0 -0

index 81037907268d..b8af7ad6c607 100644
@@ -161,10 +161,12 @@ iommu_arena_find_pages(struct device *dev, struct pci_iommu_arena *arena,
  			goto again;
  		}

arch/alpha/kernel/pci_iommu.c +4 -3

-		if (ptes[p+i])
-			p = ALIGN(p + i + 1, mask + 1), i = 0;
-		else
+		if (ptes[p+i]) {
+			p = ALIGN(p + i + 1, mask + 1);
+			i = 0;
+		} else {

  i = i + 1;

arch/alpha/kernel/pci_iommu.c +1 -0

+		}

  }

  if (i < n) {

arch/alpha/oprofile/op_model_ev4.c +0 -0

index 086a0d5445c5..004f80a4291f 100644
@@ -46,18 +46,24 @@ ev4_reg_setup(struct op_register_config *reg,

  map it onto one of the possible values, and write it back. */

  count = ctr[0].count;

arch/alpha/oprofile/op_model_ev4.c +7 -4

-	if (count <= 4096)
-		count = 4096, hilo = 1;
-	else
-		count = 65536, hilo = 0;
+	if (count <= 4096) {
+		count = 4096;
+		hilo = 1;
+	} else {
+		count = 65536;
+		hilo = 0;
+	}

  ctr[0].count = count;
  ctl |= (ctr[0].enabled && hilo) << 3;

  count = ctr[1].count;

arch/alpha/oprofile/op_model_ev4.c +7 -4

-	if (count <= 256)
-		count = 256, hilo = 1;
-	else
-		count = 4096, hilo = 0;
+	if (count <= 256) {
+		count = 256;
+		hilo = 1;
+	} else {
+		count = 4096;
+		hilo = 0;
+	}

  ctr[1].count = count;
  ctl |= (ctr[1].enabled && hilo);

arch/alpha/oprofile/op_model_ev5.c +0 -0

index c300f5ef3482..6f52244e1181 100644
@@ -92,9 +92,11 @@ common_reg_setup(struct op_register_config *reg,
  		if (!ctr[i].enabled)
  			continue;

arch/alpha/oprofile/op_model_ev5.c +5 -3

-		if (count <= 256)
-			count = 256, hilo = 3, max = 256;
-		else {
+		if (count <= 256) {
+			max = 256;
+			hilo = 3;
+			count = 256;
+		} else {

  max = (i == 2 ? 16384 : 65536); hilo = 2;
  if (count > max)

Quoted 1 line · Joe Perches

Use semicolons and braces.

ping?

Quoted 6 lines

Signed-off-by Joe Perches <[email protected]>

---

 arch/alpha/kernel/pci_iommu.c      |  8 +++++---
 arch/alpha/oprofile/op_model_ev4.c | 22 ++++++++++++++--------
 arch/alpha/oprofile/op_model_ev5.c |  8 +++++---

Quoted 1 line

 3 files changed, 24 insertions(+), 14 deletions(-)

Quoted 6 lines · Joe Perches

Quoted 1 line · Joe Perches

Use semicolons and braces.

ping?

Quoted 1 line

Quoted 5 lines

Quoted 5 lines

Signed-off-by Joe Perches <[email protected]>

---

 arch/alpha/kernel/pci_iommu.c      |  8 +++++---
 arch/alpha/oprofile/op_model_ev4.c | 22 ++++++++++++++--------
 arch/alpha/oprofile/op_model_ev5.c |  8 +++++---

This patch should be rebased as oprofile is going to be removed in 5.12. A branch is in linux-next.

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 arch/ia64/kernel/smpboot.c | 7 +++++--

 1 file changed, 5 insertions(+), 2 deletions(-)

arch/ia64/kernel/smpboot.c +0 -0

index c29c600d7967..3311b9d21319 100644
@@ -224,8 +224,11 @@ get_delta (long *rt, long *master)
  		go[SLAVE] = 0;
  		t1 = ia64_get_itc();

arch/ia64/kernel/smpboot.c +5 -2

-		if (t1 - t0 < best_t1 - best_t0)
-			best_t0 = t0, best_t1 = t1, best_tm = tm;
+		if (t1 - t0 < best_t1 - best_t0) {
+			best_t0 = t0;
+			best_t1 = t1;
+			best_tm = tm;
+		}

  }

  *rt = best_t1 - best_t0;

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 arch/sparc/kernel/smp_64.c | 7 +++++--

 1 file changed, 5 insertions(+), 2 deletions(-)

arch/sparc/kernel/smp_64.c +0 -0

index e286e2badc8a..28c11f7871cd 100644
@@ -186,8 +186,11 @@ static inline long get_delta (long *rt, long *master)
  		wmb();
  		t1 = tick_ops->get_tick();

arch/sparc/kernel/smp_64.c +5 -2

-		if (t1 - t0 < best_t1 - best_t0)
-			best_t0 = t0, best_t1 = t1, best_tm = tm;
+		if (t1 - t0 < best_t1 - best_t0) {
+			best_t0 = t0;
+			best_t1 = t1;
+			best_tm = tm;
+		}

  }

  *rt = best_t1 - best_t0;

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/ata/pata_icside.c | 21 +++++++++++++--------

 1 file changed, 13 insertions(+), 8 deletions(-)

drivers/ata/pata_icside.c +13 -8

index 08543aeb0093..498383cb6e29 100644
@@ -202,14 +202,19 @@ static void pata_icside_set_dmamode(struct ata_port *ap, struct ata_device *adev
  	 * Choose the IOMD cycle timing which ensure that the interface
  	 * satisfies the measured active, recovery and cycle times.
  	 */
-	if (t.active <= 50 && t.recover <= 375 && t.cycle <= 425)
-		iomd_type = 'D', cycle = 187;
-	else if (t.active <= 125 && t.recover <= 375 && t.cycle <= 500)
-		iomd_type = 'C', cycle = 250;
-	else if (t.active <= 200 && t.recover <= 550 && t.cycle <= 750)
-		iomd_type = 'B', cycle = 437;
-	else
-		iomd_type = 'A', cycle = 562;
+	if (t.active <= 50 && t.recover <= 375 && t.cycle <= 425) {
+		iomd_type = 'D';
+		cycle = 187;
+	} else if (t.active <= 125 && t.recover <= 375 && t.cycle <= 500) {
+		iomd_type = 'C';
+		cycle = 250;
+	} else if (t.active <= 200 && t.recover <= 550 && t.cycle <= 750) {
+		iomd_type = 'B';
+		cycle = 437;
+	} else {
+		iomd_type = 'A';
+		cycle = 562;
+	}

  ata_dev_info(adev, "timings: act %dns rec %dns cyc %dns (%c)\n", t.active, t.recover, t.cycle, iomd_type);

Quoted 1 line · Joe Perches

Use semicolons and braces.

ping?

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/block/drbd/drbd_receiver.c | 6 ++++--

 1 file changed, 4 insertions(+), 2 deletions(-)

drivers/block/drbd/drbd_receiver.c +4 -2

index 422363daa618..87f732fb5456 100644
@@ -111,8 +111,10 @@ static struct page *page_chain_tail(struct page *page, int *len)
  {
  	struct page *tmp;
  	int i = 1;
-	while ((tmp = page_chain_next(page)))
-		++i, page = tmp;
+	while ((tmp = page_chain_next(page))) {
+		++i;
+		page = tmp;
+	}
  	if (len)
  		*len = i;
  	return page;

Quoted 1 line · Joe Perches

Use semicolons and braces.

ping?

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
  drivers/dma-buf/st-dma-fence.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)

drivers/dma-buf/st-dma-fence.c +0 -0

index e593064341c8..c8a12d7ad71a 100644
@@ -471,8 +471,11 @@ static int thread_signal_callback(void *arg)
  			dma_fence_signal(f1);
 
  		smp_store_mb(cb.seen, false);

Am 25.08.20 um 06:56 schrieb Joe Perches:

Quoted 3 lines

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

Acked-by Christian König <[email protected]>

Quoted 21 lines

---
  drivers/dma-buf/st-dma-fence.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)

drivers/dma-buf/st-dma-fence.c +5 -2

index e593064341c8..c8a12d7ad71a 100644
@@ -471,8 +471,11 @@ static int thread_signal_callback(void *arg)
                      dma_fence_signal(f1);
 
              smp_store_mb(cb.seen, false);
-             if (!f2 || dma_fence_add_callback(f2, &cb.cb, simple_callback))
-                     miss++, cb.seen = true;
+             if (!f2 ||
+                 dma_fence_add_callback(f2, &cb.cb, simple_callback)) {
+                     miss++;
+                     cb.seen = true;
+             }
 

drivers/dma-buf/st-dma-fence.c static int thread_signal_callback(void *arg) · line 481

Quoted 2 lines

drivers/dma-buf/st-dma-fence.c +0 -0

              if (!t->before)
                      dma_fence_signal(f1);

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/dma-buf/st-dma-fence.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

drivers/dma-buf/st-dma-fence.c +0 -0

index e593064341c8..c8a12d7ad71a 100644
@@ -471,8 +471,11 @@ static int thread_signal_callback(void *arg)
 			dma_fence_signal(f1);
 
 		smp_store_mb(cb.seen, false);

I'm pleased to see this is treewide ;-)
Definitely prefer this.

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/dma-buf/st-dma-fence.c | 7 +++++--

 1 file changed, 5 insertions(+), 2 deletions(-)

drivers/dma-buf/st-dma-fence.c +0 -0

index e593064341c8..c8a12d7ad71a 100644
@@ -471,8 +471,11 @@ static int thread_signal_callback(void *arg)
  			dma_fence_signal(f1);

  smp_store_mb(cb.seen, false);

drivers/dma-buf/st-dma-fence.c +5 -2

-		if (!f2 || dma_fence_add_callback(f2, &cb.cb, simple_callback))
-			miss++, cb.seen = true;
+		if (!f2 ||
+		    dma_fence_add_callback(f2, &cb.cb, simple_callback)) {
+			miss++;
+			cb.seen = true;
+		}

  if (!t->before)
  dma_fence_signal(f1);

Quoted 1 line

Use semicolons and braces.

Ping?

Quoted 1 line

Signed-off-by Joe Perches <[email protected]>

Quoted 22 lines

---
  drivers/dma-buf/st-dma-fence.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)

drivers/dma-buf/st-dma-fence.c +5 -2

index e593064341c8..c8a12d7ad71a 100644
@@ -471,8 +471,11 @@ static int thread_signal_callback(void *arg)
  			dma_fence_signal(f1);
 
 
  		smp_store_mb(cb.seen, false);
-		if (!f2 || dma_fence_add_callback(f2, &cb.cb, simple_callback))
-			miss++, cb.seen = true;
+		if (!f2 ||
+		    dma_fence_add_callback(f2, &cb.cb, simple_callback)) {
+			miss++;
+			cb.seen = true;
+		}
 
 

Quoted 2 lines

  if (!t->before)
  dma_fence_signal(f1);

Am 30.01.21 um 19:47 schrieb Joe Perches:

Quoted 4 lines · Joe Perches

Quoted 1 line

Use semicolons and braces.

Ping?

Quoted 1 line

Signed-off-by Joe Perches <[email protected]>

Reviewed-by Christian König <[email protected]>

Do you have commit rights to drm-misc-next?

Quoted 20 lines

Quoted 20 lines

---
  drivers/dma-buf/st-dma-fence.c | 7 +++++--

  1 file changed, 5 insertions(+), 2 deletions(-)

drivers/dma-buf/st-dma-fence.c +5 -2

index e593064341c8..c8a12d7ad71a 100644
@@ -471,8 +471,11 @@ static int thread_signal_callback(void *arg)
   			dma_fence_signal(f1);
 
   		smp_store_mb(cb.seen, false);
-		if (!f2 || dma_fence_add_callback(f2, &cb.cb, simple_callback))
-			miss++, cb.seen = true;
+		if (!f2 ||
+		    dma_fence_add_callback(f2, &cb.cb, simple_callback)) {
+			miss++;
+			cb.seen = true;
+		}
 

Quoted 3 lines

drivers/dma-buf/st-dma-fence.c static int thread_signal_callback(void *arg) · line 481

Quoted 2 lines

drivers/dma-buf/st-dma-fence.c +0 -0

   		if (!t->before)
   			dma_fence_signal(f1);

Quoted 8 lines

Am 30.01.21 um 19:47 schrieb Joe Perches:

Quoted 4 lines · Joe Perches

Quoted 1 line

Use semicolons and braces.

Ping?

Quoted 1 line

Signed-off-by Joe Perches <[email protected]>

Reviewed-by Christian König <[email protected]>

Do you have commit rights to drm-misc-next?

No.

Quoted 21 lines

Quoted 21 lines

Quoted 21 lines

---
   drivers/dma-buf/st-dma-fence.c | 7 +++++--
   1 file changed, 5 insertions(+), 2 deletions(-)

drivers/dma-buf/st-dma-fence.c +5 -2

index e593064341c8..c8a12d7ad71a 100644
@@ -471,8 +471,11 @@ static int thread_signal_callback(void *arg)
   			dma_fence_signal(f1);
 
   		smp_store_mb(cb.seen, false);
-		if (!f2 || dma_fence_add_callback(f2, &cb.cb, simple_callback))
-			miss++, cb.seen = true;
+		if (!f2 ||
+		    dma_fence_add_callback(f2, &cb.cb, simple_callback)) {
+			miss++;
+			cb.seen = true;
+		}
 

Quoted 2 lines

Quoted 2 lines

drivers/dma-buf/st-dma-fence.c static int thread_signal_callback(void *arg) · line 481

Quoted 2 lines

drivers/dma-buf/st-dma-fence.c +0 -0

   		if (!t->before)
   			dma_fence_signal(f1);

Am 30.01.21 um 19:47 schrieb Joe Perches:

Quoted 5 lines · Joe Perches

Quoted 1 line

Use semicolons and braces.

Ping?

Quoted 1 line

Signed-off-by Joe Perches <[email protected]>

Reviewed-by Christian König <[email protected]>

Do you have commit rights to drm-misc-next?

Quoted 24 lines

Quoted 24 lines

---
  drivers/dma-buf/st-dma-fence.c | 7 +++++--

  1 file changed, 5 insertions(+), 2 deletions(-)

drivers/dma-buf/st-dma- renamed from drivers/dma-buf/st-dma-fence.c +0 -0

fence.c
index e593064341c8..c8a12d7ad71a 100644

drivers/dma-buf/st-dma-fence.c +0 -0

@@ -471,8 +471,11 @@ static int thread_signal_callback(void *arg)
                         dma_fence_signal(f1);

                smp_store_mb(cb.seen, false);
-               if (!f2 || dma_fence_add_callback(f2, &cb.cb, simple_callback))
-                       miss++, cb.seen = true;
+               if (!f2 ||
+                   dma_fence_add_callback(f2, &cb.cb, simple_callback)) { +                       miss++;
+                       cb.seen = true;
+               }

Quoted 3 lines

Quoted 2 lines

                if (!t->before)
                        dma_fence_signal(f1);

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

This is entirely unrelated to this thread, but I noticed when going through dri- devel that this email is somehow dated two days in the future from now.

Quoted 40 lines · Christian König

Am 30.01.21 um 19:47 schrieb Joe Perches:

Quoted 5 lines · Joe Perches

Quoted 1 line

Use semicolons and braces.

Ping?

Quoted 1 line

Signed-off-by Joe Perches <[email protected]>

Reviewed-by Christian König <[email protected]>

Do you have commit rights to drm-misc-next?

Quoted 24 lines

Quoted 24 lines

---
   drivers/dma-buf/st-dma-fence.c | 7 +++++--
   1 file changed, 5 insertions(+), 2 deletions(-)

drivers/dma-buf/st-dma- renamed from drivers/dma-buf/st-dma-fence.c +0 -0

fence.c
index e593064341c8..c8a12d7ad71a 100644

drivers/dma-buf/st-dma-fence.c +5 -2

@@ -471,8 +471,11 @@ static int thread_signal_callback(void *arg)
                         dma_fence_signal(f1);
 
 
                 smp_store_mb(cb.seen, false);
-               if (!f2 || dma_fence_add_callback(f2, &cb.cb,
 simple_callback))
-                       miss++, cb.seen = true;
+               if (!f2 ||
+                   dma_fence_add_callback(f2, &cb.cb, simple_callback)) {
+                       miss++;
+                       cb.seen = true;
+               }
 

Quoted 2 lines

Quoted 2 lines

                if (!t->before)
                        dma_fence_signal(f1);

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Yeah, known issue.

An NTP server which I don't have access to has gone bananas and sometimes spits out invalid time stamps.

Only thing I can do is wait for an admin to take care of this.

Christian.

Am 01.02.21 um 22:54 schrieb Lyude Paul:

Quoted 46 lines

This is entirely unrelated to this thread, but I noticed when going through dri-
devel that this email is somehow dated two days in the future from now.

Quoted 41 lines · Christian König

Am 30.01.21 um 19:47 schrieb Joe Perches:

Quoted 5 lines · Joe Perches

Quoted 1 line

Use semicolons and braces.

Ping?

Quoted 1 line

Signed-off-by Joe Perches <[email protected]>

Reviewed-by Christian König <[email protected]>

Do you have commit rights to drm-misc-next?

Quoted 25 lines

Quoted 25 lines

---
   drivers/dma-buf/st-dma-fence.c | 7 +++++--

   1 file changed, 5 insertions(+), 2 deletions(-)

drivers/dma-buf/st-dma- renamed from drivers/dma-buf/st-dma-fence.c +0 -0

fence.c
index e593064341c8..c8a12d7ad71a 100644

drivers/dma-buf/st-dma-fence.c +0 -0

@@ -471,8 +471,11 @@ static int thread_signal_callback(void *arg)
                          dma_fence_signal(f1);

                 smp_store_mb(cb.seen, false);
-               if (!f2 || dma_fence_add_callback(f2, &cb.cb, simple_callback))
-                       miss++, cb.seen = true;
+               if (!f2 ||
+                   dma_fence_add_callback(f2, &cb.cb, simple_callback)) {
+                       miss++;
+                       cb.seen = true;
+               }

Quoted 2 lines

Quoted 2 lines

                 if (!t->before)
                         dma_fence_signal(f1);

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/gpu/drm/gma500/mdfld_intel_display.c | 44 +++++++++++++-------

 1 file changed, 28 insertions(+), 16 deletions(-)

drivers/gpu/drm/gma500/mdfld_intel_display.c +0 -0

index aae2d358364c..bfa330df9443 100644
@@ -824,33 +824,45 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
  		if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19)) {
  			refclk = 19200;

drivers/gpu/drm/gma500/mdfld_intel_display.c +7 -4

-			if (is_mipi || is_mipi2)
-				clk_n = 1, clk_p2 = 8;
-			else if (is_hdmi)
-				clk_n = 1, clk_p2 = 10;
+			if (is_mipi || is_mipi2) {
+				clk_n = 1;
+				clk_p2 = 8;
+			} else if (is_hdmi) {
+				clk_n = 1;
+				clk_p2 = 10;
+			}

  } else if (ksel == KSEL_BYPASS_25) { refclk = 25000;

drivers/gpu/drm/gma500/mdfld_intel_display.c +7 -4

-			if (is_mipi || is_mipi2)
-				clk_n = 1, clk_p2 = 8;
-			else if (is_hdmi)
-				clk_n = 1, clk_p2 = 10;
+			if (is_mipi || is_mipi2) {
+				clk_n = 1;
+				clk_p2 = 8;
+			} else if (is_hdmi) {
+				clk_n = 1;
+				clk_p2 = 10;
+			}

  } else if ((ksel == KSEL_BYPASS_83_100) && dev_priv->core_freq == 166) { refclk = 83000;

drivers/gpu/drm/gma500/mdfld_intel_display.c +7 -4

-			if (is_mipi || is_mipi2)
-				clk_n = 4, clk_p2 = 8;
-			else if (is_hdmi)
-				clk_n = 4, clk_p2 = 10;
+			if (is_mipi || is_mipi2) {
+				clk_n = 4;
+				clk_p2 = 8;
+			} else if (is_hdmi) {
+				clk_n = 4;
+				clk_p2 = 10;
+			}

  } else if ((ksel == KSEL_BYPASS_83_100) && (dev_priv->core_freq == 100 || dev_priv->core_freq == 200)) { refclk = 100000;

drivers/gpu/drm/gma500/mdfld_intel_display.c +7 -4

-			if (is_mipi || is_mipi2)
-				clk_n = 4, clk_p2 = 8;
-			else if (is_hdmi)
-				clk_n = 4, clk_p2 = 10;
+			if (is_mipi || is_mipi2) {
+				clk_n = 4;
+				clk_p2 = 8;
+			} else if (is_hdmi) {
+				clk_n = 4;
+				clk_p2 = 10;
+			}

  }

  if (is_mipi)

Quoted 1 line · Joe Perches

Use semicolons and braces.

Ping?

Quoted 75 lines

Signed-off-by Joe Perches <[email protected]>

---
 drivers/gpu/drm/gma500/mdfld_intel_display.c | 44 +++++++++++++-------
 1 file changed, 28 insertions(+), 16 deletions(-)

drivers/gpu/drm/gma500/mdfld_intel_display.c +28 -16

index aae2d358364c..bfa330df9443 100644
@@ -824,33 +824,45 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
              if ((ksel == KSEL_CRYSTAL_19) || (ksel == KSEL_BYPASS_19)) {
                      refclk = 19200;
 
 
-                     if (is_mipi || is_mipi2)
-                             clk_n = 1, clk_p2 = 8;
-                     else if (is_hdmi)
-                             clk_n = 1, clk_p2 = 10;
+                     if (is_mipi || is_mipi2) {
+                             clk_n = 1;
+                             clk_p2 = 8;
+                     } else if (is_hdmi) {
+                             clk_n = 1;
+                             clk_p2 = 10;
+                     }
              } else if (ksel == KSEL_BYPASS_25) {
                      refclk = 25000;
 
 
-                     if (is_mipi || is_mipi2)
-                             clk_n = 1, clk_p2 = 8;
-                     else if (is_hdmi)
-                             clk_n = 1, clk_p2 = 10;
+                     if (is_mipi || is_mipi2) {
+                             clk_n = 1;
+                             clk_p2 = 8;
+                     } else if (is_hdmi) {
+                             clk_n = 1;
+                             clk_p2 = 10;
+                     }
              } else if ((ksel == KSEL_BYPASS_83_100) &&
                                      dev_priv->core_freq == 166) {
                      refclk = 83000;
 
 
-                     if (is_mipi || is_mipi2)
-                             clk_n = 4, clk_p2 = 8;
-                     else if (is_hdmi)
-                             clk_n = 4, clk_p2 = 10;
+                     if (is_mipi || is_mipi2) {
+                             clk_n = 4;
+                             clk_p2 = 8;
+                     } else if (is_hdmi) {
+                             clk_n = 4;
+                             clk_p2 = 10;
+                     }
              } else if ((ksel == KSEL_BYPASS_83_100) &&
                                      (dev_priv->core_freq == 100 ||
                                      dev_priv->core_freq == 200)) {
                      refclk = 100000;
-                     if (is_mipi || is_mipi2)
-                             clk_n = 4, clk_p2 = 8;
-                     else if (is_hdmi)
-                             clk_n = 4, clk_p2 = 10;
+                     if (is_mipi || is_mipi2) {
+                             clk_n = 4;
+                             clk_p2 = 8;
+                     } else if (is_hdmi) {
+                             clk_n = 4;
+                             clk_p2 = 10;
+                     }

              }

Quoted 1 line

if (is_mipi)

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---

 drivers/gpu/drm/i915/gt/gen8_ppgtt.c           | 8 +++++---
 drivers/gpu/drm/i915/gt/intel_gt_requests.c    | 6 ++++--
 drivers/gpu/drm/i915/gt/selftest_workarounds.c | 6 ++++--
 drivers/gpu/drm/i915/intel_runtime_pm.c        | 6 ++++--
 4 files changed, 17 insertions(+), 9 deletions(-)

drivers/gpu/drm/i915/gt/gen8_ppgtt.c +0 -0

index 699125928272..114c13285ff1 100644
@@ -323,10 +323,12 @@ static int __gen8_ppgtt_alloc(struct i915_address_space * const vm,
  			}

  spin_lock(&pd->lock);

drivers/gpu/drm/i915/gt/gen8_ppgtt.c +1 -1

-			if (likely(!pd->entry[idx]))
+			if (likely(!pd->entry[idx])) {

  set_pd_entry(pd, idx, pt);

drivers/gpu/drm/i915/gt/gen8_ppgtt.c +4 -2

-			else
-				alloc = pt, pt = pd->entry[idx];
+			} else {
+				alloc = pt;
+				pt = pd->entry[idx];
+			}

  }

  if (lvl) {

drivers/gpu/drm/i915/gt/intel_gt_requests.c +0 -0

index 66fcbf9d0fdd..54408d0b5e6e 100644
@@ -139,8 +139,10 @@ long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout)
  	LIST_HEAD(free);

  interruptible = true;

drivers/gpu/drm/i915/gt/intel_gt_requests.c +4 -2

-	if (unlikely(timeout < 0))
-		timeout = -timeout, interruptible = false;
+	if (unlikely(timeout < 0)) {
+		timeout = -timeout;
+		interruptible = false;
+	}

  flush_submission(gt, timeout); /* kick the ksoftirqd tasklets */ spin_lock(&timelines->lock);

drivers/gpu/drm/i915/gt/selftest_workarounds.c +0 -0

index febc9e6692ba..3e4cbeed20bd 100644
@@ -521,8 +521,10 @@ static int check_dirty_whitelist(struct intel_context *ce)

  srm = MI_STORE_REGISTER_MEM;
  lrm = MI_LOAD_REGISTER_MEM;

drivers/gpu/drm/i915/gt/selftest_workarounds.c +4 -2

-		if (INTEL_GEN(engine->i915) >= 8)
-			lrm++, srm++;
+		if (INTEL_GEN(engine->i915) >= 8) {
+			lrm++;
+			srm++;
+		}

  pr_debug("%s: Writing garbage to %x\n", engine->name, reg);

drivers/gpu/drm/i915/intel_runtime_pm.c +0 -0

index 153ca9e65382..f498f1c80755 100644
@@ -201,8 +201,10 @@ __print_intel_runtime_pm_wakeref(struct drm_printer *p,
  		unsigned long rep;

  rep = 1;

drivers/gpu/drm/i915/intel_runtime_pm.c +4 -2

-		while (i + 1 < dbg->count && dbg->owners[i + 1] == stack)
-			rep++, i++;
+		while (i + 1 < dbg->count && dbg->owners[i + 1] == stack) {
+			rep++;
+			i++;
+		}

  __print_depot_stack(stack, buf, PAGE_SIZE, 2); drm_printf(p, "Wakeref x%lu taken at:\n%s", rep, buf); }

Quoted 1 line · Joe Perches

Use semicolons and braces.

Ping?

Quoted 87 lines

Signed-off-by Joe Perches <[email protected]>

---

 drivers/gpu/drm/i915/gt/gen8_ppgtt.c           | 8 +++++---
 drivers/gpu/drm/i915/gt/intel_gt_requests.c    | 6 ++++--
 drivers/gpu/drm/i915/gt/selftest_workarounds.c | 6 ++++--
 drivers/gpu/drm/i915/intel_runtime_pm.c        | 6 ++++--
 4 files changed, 17 insertions(+), 9 deletions(-)

drivers/gpu/drm/i915/gt/gen8_ppgtt.c +0 -0

index 699125928272..114c13285ff1 100644
@@ -323,10 +323,12 @@ static int __gen8_ppgtt_alloc(struct i915_address_space * const vm,
  			}

  spin_lock(&pd->lock);

drivers/gpu/drm/i915/gt/gen8_ppgtt.c +1 -1

-			if (likely(!pd->entry[idx]))
+			if (likely(!pd->entry[idx])) {

  set_pd_entry(pd, idx, pt);

drivers/gpu/drm/i915/gt/gen8_ppgtt.c +4 -2

-			else
-				alloc = pt, pt = pd->entry[idx];
+			} else {
+				alloc = pt;
+				pt = pd->entry[idx];
+			}

  }

  if (lvl) {

drivers/gpu/drm/i915/gt/intel_gt_requests.c +0 -0

index 66fcbf9d0fdd..54408d0b5e6e 100644
@@ -139,8 +139,10 @@ long intel_gt_retire_requests_timeout(struct intel_gt *gt, long timeout)
  	LIST_HEAD(free);

  interruptible = true;

drivers/gpu/drm/i915/gt/intel_gt_requests.c +4 -2

-	if (unlikely(timeout < 0))
-		timeout = -timeout, interruptible = false;
+	if (unlikely(timeout < 0)) {
+		timeout = -timeout;
+		interruptible = false;
+	}

  flush_submission(gt, timeout); /* kick the ksoftirqd tasklets */ spin_lock(&timelines->lock);

drivers/gpu/drm/i915/gt/selftest_workarounds.c +0 -0

index febc9e6692ba..3e4cbeed20bd 100644
@@ -521,8 +521,10 @@ static int check_dirty_whitelist(struct intel_context *ce)

  srm = MI_STORE_REGISTER_MEM;
  lrm = MI_LOAD_REGISTER_MEM;

drivers/gpu/drm/i915/gt/selftest_workarounds.c +4 -2

-		if (INTEL_GEN(engine->i915) >= 8)
-			lrm++, srm++;
+		if (INTEL_GEN(engine->i915) >= 8) {
+			lrm++;
+			srm++;
+		}

  pr_debug("%s: Writing garbage to %x\n", engine->name, reg);

drivers/gpu/drm/i915/intel_runtime_pm.c +0 -0

index 153ca9e65382..f498f1c80755 100644
@@ -201,8 +201,10 @@ __print_intel_runtime_pm_wakeref(struct drm_printer *p,
  		unsigned long rep;

  rep = 1;

drivers/gpu/drm/i915/intel_runtime_pm.c +4 -2

-		while (i + 1 < dbg->count && dbg->owners[i + 1] == stack)
-			rep++, i++;
+		while (i + 1 < dbg->count && dbg->owners[i + 1] == stack) {
+			rep++;
+			i++;
+		}

  __print_depot_stack(stack, buf, PAGE_SIZE, 2); drm_printf(p, "Wakeref x%lu taken at:\n%s", rep, buf); }

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/hwmon/scmi-hwmon.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

drivers/hwmon/scmi-hwmon.c +4 -2

index d421e691318b..09ce30cba54b 100644
@@ -202,8 +202,10 @@ static int scmi_hwmon_probe(struct scmi_device *sdev)
 		}
 	}
 
-	if (nr_count[hwmon_temp])
-		nr_count[hwmon_chip]++, nr_types++;
+	if (nr_count[hwmon_temp]) {
+		nr_count[hwmon_chip]++;
+		nr_types++;
+	}
 
 	scmi_hwmon_chan = devm_kcalloc(dev, nr_types, sizeof(*scmi_hwmon_chan),
 				       GFP_KERNEL);

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/md/bcache/bset.c | 12 ++++++++----
 drivers/md/bcache/sysfs.c | 6 ++++--

 2 files changed, 12 insertions(+), 6 deletions(-)

drivers/md/bcache/bset.c +4 -2

index 67a2c47f4201..94d38e8a59b3 100644
@@ -712,8 +712,10 @@ void bch_bset_build_written_tree(struct btree_keys *b)
  	for (j = inorder_next(0, t->size);
  	     j;
  	     j = inorder_next(j, t->size)) {
-		while (bkey_to_cacheline(t, k) < cacheline)
-			prev = k, k = bkey_next(k);
+		while (bkey_to_cacheline(t, k) < cacheline) {
+			prev = k;
+			k = bkey_next(k);
+		}

  t->prev[j] = bkey_u64s(prev);
  t->tree[j].m = bkey_to_cacheline_offset(t, cacheline++, k);

drivers/md/bcache/bset.c +0 -0

@@ -901,8 +903,10 @@ unsigned int bch_btree_insert_key(struct btree_keys *b, struct bkey *k,
  	status = BTREE_INSERT_STATUS_INSERT;

  while (m != bset_bkey_last(i) &&

drivers/md/bcache/bset.c +4 -2

-	       bkey_cmp(k, b->ops->is_extents ? &START_KEY(m) : m) > 0)
-		prev = m, m = bkey_next(m);
+	       bkey_cmp(k, b->ops->is_extents ? &START_KEY(m) : m) > 0) {
+		prev = m;
+		m = bkey_next(m);
+	}

  /* prev is in the tree, if we merge we're done */ status = BTREE_INSERT_STATUS_BACK_MERGE;

drivers/md/bcache/sysfs.c +0 -0

index ac06c0bc3c0a..1878c5ee53b6 100644
@@ -1071,8 +1071,10 @@ SHOW(__bch_cache)
  			--n;

  while (cached < p + n &&

drivers/md/bcache/sysfs.c +4 -2

-		       *cached == BTREE_PRIO)
-			cached++, n--;
+		       *cached == BTREE_PRIO) {
+			cached++;
+			n--;
+		}

  for (i = 0; i < n; i++)
  sum += INITIAL_PRIO - cached[i];

Quoted 1 line · Joe Perches

Use semicolons and braces.

ping?

Quoted 59 lines

Signed-off-by Joe Perches <[email protected]>

---
 drivers/md/bcache/bset.c | 12 ++++++++----
 drivers/md/bcache/sysfs.c | 6 ++++--

 2 files changed, 12 insertions(+), 6 deletions(-)

drivers/md/bcache/bset.c +4 -2

index 67a2c47f4201..94d38e8a59b3 100644
@@ -712,8 +712,10 @@ void bch_bset_build_written_tree(struct btree_keys *b)
  	for (j = inorder_next(0, t->size);
  	     j;
  	     j = inorder_next(j, t->size)) {
-		while (bkey_to_cacheline(t, k) < cacheline)
-			prev = k, k = bkey_next(k);
+		while (bkey_to_cacheline(t, k) < cacheline) {
+			prev = k;
+			k = bkey_next(k);
+		}

  t->prev[j] = bkey_u64s(prev);
  t->tree[j].m = bkey_to_cacheline_offset(t, cacheline++, k);

drivers/md/bcache/bset.c +0 -0

@@ -901,8 +903,10 @@ unsigned int bch_btree_insert_key(struct btree_keys *b, struct bkey *k,
  	status = BTREE_INSERT_STATUS_INSERT;

  while (m != bset_bkey_last(i) &&

drivers/md/bcache/bset.c +4 -2

-	       bkey_cmp(k, b->ops->is_extents ? &START_KEY(m) : m) > 0)
-		prev = m, m = bkey_next(m);
+	       bkey_cmp(k, b->ops->is_extents ? &START_KEY(m) : m) > 0) {
+		prev = m;
+		m = bkey_next(m);
+	}

  /* prev is in the tree, if we merge we're done */ status = BTREE_INSERT_STATUS_BACK_MERGE;

drivers/md/bcache/sysfs.c +0 -0

index ac06c0bc3c0a..1878c5ee53b6 100644
@@ -1071,8 +1071,10 @@ SHOW(__bch_cache)
  			--n;

  while (cached < p + n &&

drivers/md/bcache/sysfs.c +4 -2

-		       *cached == BTREE_PRIO)
-			cached++, n--;
+		       *cached == BTREE_PRIO) {
+			cached++;
+			n--;
+		}

  for (i = 0; i < n; i++)
  sum += INITIAL_PRIO - cached[i];

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/media/i2c/msp3400-kthreads.c      | 12 ++++++++----
 drivers/media/pci/bt8xx/bttv-cards.c      |  6 ++++--
 drivers/media/pci/saa7134/saa7134-video.c |  7 +++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

drivers/media/i2c/msp3400-kthreads.c +8 -4

index d3b0d1c18efd..ac8752c63266 100644
@@ -549,8 +549,10 @@ int msp3400c_thread(void *data)
 			val = msp_read_dsp(client, 0x1b);
 			if (val > 32767)
 				val -= 65536;
-			if (val1 < val)
-				val1 = val, max1 = i;
+			if (val1 < val) {
+				val1 = val;
+				max1 = i;
+			}
 			dev_dbg_lvl(&client->dev, 1, msp_debug,
 				"carrier1 val: %5d / %s\n", val, cd[i].name);
 		}

@@ -586,8 +588,10 @@ int msp3400c_thread(void *data)
 			val = msp_read_dsp(client, 0x1b);
 			if (val > 32767)
 				val -= 65536;
-			if (val2 < val)
-				val2 = val, max2 = i;
+			if (val2 < val) {
+				val2 = val;
+				max2 = i;
+			}
 			dev_dbg_lvl(&client->dev, 1, msp_debug,
 				"carrier2 val: %5d / %s\n", val, cd[i].name);
 		}

drivers/media/pci/bt8xx/bttv-cards.c +4 -2

index 16148802dabb..ca20b806e82d 100644
@@ -3934,8 +3934,10 @@ static void osprey_eeprom(struct bttv *btv, const u8 ee[256])
 			if (checksum != ee[21])
 				return;
 			cardid = BTTV_BOARD_OSPREY1x0_848;
-			for (i = 12; i < 21; i++)
-				serial *= 10, serial += ee[i] - '0';
+			for (i = 12; i < 21; i++) {
+				serial *= 10;
+				serial += ee[i] - '0';
+			}
 		}
 	} else {
 		unsigned short type;

drivers/media/pci/saa7134/saa7134-video.c +0 -0

index a8ac94fadc14..f673cda57f30 100644

drivers/media/pci/saa7134/saa7134-video.c +1 -0

+		}
 		video_dbg("uv: bpl=%ld lines=%ld base2/3=%ld/%ld\n",
 			bpl_uv,lines_uv,base2,base3);
 		if (V4L2_FIELD_HAS_BOTH(dev->field)) {

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
�drivers/s390/char/tty3270.c | 6 ++++-- �1 file changed, 4 insertions(+), 2 deletions(-)

drivers/s390/char/tty3270.c +0 -0

index aec996de44d9..6acce975df26 100644
@@ -424,8 +424,10 @@ tty3270_update(struct timer_list *t)

� * last output position matches the start address
� * of this line.
� */

drivers/s390/char/tty3270.c +4 -2

-			if (s->string[1] == sba[0] && s->string[2] == sba[1])
-				str += 3, len -= 3;
+			if (s->string[1] == sba[0] && s->string[2] == sba[1]) {
+				str += 3;
+				len -= 3;
+			}

� if (raw3270_request_add_data(wrq, str, len) != 0)
� break;
� list_del_init(&s->update);

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/staging/media/atomisp/pci/atomisp_subdev.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

drivers/staging/media/atomisp/pci/atomisp_subdev.c +4 -2

index 6ba817f15655..52b9fb18c87f 100644
@@ -410,8 +410,10 @@ int atomisp_subdev_set_selection(struct v4l2_subdev *sd,
 
 		if (atomisp_subdev_format_conversion(isp_sd,
 						     isp_sd->capture_pad)
-		    && crop[pad]->width && crop[pad]->height)
-			crop[pad]->width -= padding_w, crop[pad]->height -= padding_h;
+		    && crop[pad]->width && crop[pad]->height) {
+			crop[pad]->width -= padding_w;
+			crop[pad]->height -= padding_h;
+		}
 
 		/* if subdev type is SOC camera,we do not need to set DVS */
 		if (isp->inputs[isp_sd->input_curr].type == SOC_CAMERA)

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 drivers/video/fbdev/tgafb.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

drivers/video/fbdev/tgafb.c +8 -4

index e9869135d833..666fbe2f671c 100644
@@ -989,8 +989,10 @@ tgafb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
 	/* We can fill 2k pixels per operation.  Notice blocks that fit
 	   the width of the screen so that we can take advantage of this
 	   and fill more than one line per write.  */
-	if (width = line_length)
-		width *= height, height = 1;
+	if (width = line_length) {
+		width *= height;
+		height = 1;
+	}
 
 	/* The write into the frame buffer must be aligned to 4 bytes,
 	   but we are allowed to encode the offset within the word in

@@ -1171,8 +1173,10 @@ copyarea_8bpp(struct fb_info *info, u32 dx, u32 dy, u32 sx, u32 sy,
 	   More than anything else, these control how we do copies.  */
 	depos = dy * line_length + dx;
 	sepos = sy * line_length + sx;
-	if (backward)
-		depos += width, sepos += width;
+	if (backward) {
+		depos += width;
+		sepos += width;
+	}
 
 	/* Next copy full words at a time.  */
 	n32 = width / 32;

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 fs/fuse/dir.c | 24 ++++++++++++++++--------

 1 file changed, 16 insertions(+), 8 deletions(-)

fs/fuse/dir.c +0 -0

index 26f028bc760b..ecb6eed832a0 100644
@@ -1362,14 +1362,22 @@ static void iattr_to_fattr(struct fuse_conn *fc, struct iattr *iattr,
  {
  	unsigned ivalid = iattr->ia_valid;

fs/fuse/dir.c +16 -8

-	if (ivalid & ATTR_MODE)
-		arg->valid |= FATTR_MODE,   arg->mode = iattr->ia_mode;
-	if (ivalid & ATTR_UID)
-		arg->valid |= FATTR_UID,    arg->uid = from_kuid(fc->user_ns, iattr->ia_uid);
-	if (ivalid & ATTR_GID)
-		arg->valid |= FATTR_GID,    arg->gid = from_kgid(fc->user_ns, iattr->ia_gid);
-	if (ivalid & ATTR_SIZE)
-		arg->valid |= FATTR_SIZE,   arg->size = iattr->ia_size;
+	if (ivalid & ATTR_MODE) {
+		arg->valid |= FATTR_MODE;
+		arg->mode = iattr->ia_mode;
+	}
+	if (ivalid & ATTR_UID) {
+		arg->valid |= FATTR_UID;
+		arg->uid = from_kuid(fc->user_ns, iattr->ia_uid);
+	}
+	if (ivalid & ATTR_GID) {
+		arg->valid |= FATTR_GID;
+		arg->gid = from_kgid(fc->user_ns, iattr->ia_gid);
+	}
+	if (ivalid & ATTR_SIZE) {
+		arg->valid |= FATTR_SIZE;
+		arg->size = iattr->ia_size;
+	}

  if (ivalid & ATTR_ATIME) { arg->valid |= FATTR_ATIME; arg->atime = iattr->ia_atime.tv_sec;

Use semicolons and braces.

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 fs/reiserfs/fix_node.c | 36 ++++++++++++++++++++++++------------

 1 file changed, 24 insertions(+), 12 deletions(-)

fs/reiserfs/fix_node.c +0 -0

index fefe87e1c099..aea63e67a42b 100644
@@ -235,8 +235,10 @@ static void check_left(struct tree_balance *tb, int h, int cur_free)
  	d_size = 0, ih_size = IH_SIZE;

  /* first item may be merge with last item in left neighbor */

fs/reiserfs/fix_node.c +4 -2

-	if (vi->vi_type & VI_TYPE_LEFT_MERGEABLE)
-		d_size = -((int)IH_SIZE), ih_size = 0;
+	if (vi->vi_type & VI_TYPE_LEFT_MERGEABLE) {
+		d_size = -((int)IH_SIZE);
+		ih_size = 0;
+	}

  tb->lnum[0] = 0;
  for (i = 0; i < vn->vn_nr_item;

fs/reiserfs/fix_node.c +0 -0

@@ -321,8 +323,10 @@ static void check_right(struct tree_balance *tb, int h, int cur_free)
  	d_size = 0, ih_size = IH_SIZE;

  /* last item may be merge with first item in right neighbor */

fs/reiserfs/fix_node.c +4 -2

-	if (vi->vi_type & VI_TYPE_RIGHT_MERGEABLE)
-		d_size = -(int)IH_SIZE, ih_size = 0;
+	if (vi->vi_type & VI_TYPE_RIGHT_MERGEABLE) {
+		d_size = -(int)IH_SIZE;
+		ih_size = 0;
+	}

  tb->rnum[0] = 0;
  for (i = vn->vn_nr_item - 1; i >= 0;

fs/reiserfs/fix_node.c +4 -2

@@ -1534,8 +1538,10 @@ static int ip_check_balance(struct tree_balance *tb, int h)
  			nver1 = get_num_ver(vn->vn_mode, tb, h,
  					    0, -1, 0, -1,
  					    snum012 + NOTHING_SHIFT_FLOW, FLOW);
-			if (nver > nver1)
-				nset = NOTHING_SHIFT_FLOW, nver = nver1;
+			if (nver > nver1) {
+				nset = NOTHING_SHIFT_FLOW;
+				nver = nver1;
+			}
  		}

  /*

fs/reiserfs/fix_node.c +4 -2

@@ -1559,8 +1565,10 @@ static int ip_check_balance(struct tree_balance *tb, int h)
  					     ((tb->lbytes != -1) ? 1 : 0),
  					     tb->lbytes, 0, -1,
  					     snum012 + LEFT_SHIFT_FLOW, FLOW);
-			if (lnver > lnver1)
-				lset = LEFT_SHIFT_FLOW, lnver = lnver1;
+			if (lnver > lnver1) {
+				lset = LEFT_SHIFT_FLOW;
+				lnver = lnver1;
+			}
  		}

  /*

fs/reiserfs/fix_node.c +0 -0

@@ -1590,8 +1598,10 @@ static int ip_check_balance(struct tree_balance *tb, int h)
  					     tb->rbytes,
  					     snum012 + RIGHT_SHIFT_FLOW, FLOW);

fs/reiserfs/fix_node.c +4 -2

-			if (rnver > rnver1)
-				rset = RIGHT_SHIFT_FLOW, rnver = rnver1;
+			if (rnver > rnver1) {
+				rset = RIGHT_SHIFT_FLOW;
+				rnver = rnver1;
+			}

  }

  /*

fs/reiserfs/fix_node.c +4 -2

@@ -1622,8 +1632,10 @@ static int ip_check_balance(struct tree_balance *tb, int h)
  					       ((tb->rbytes != -1) ? 1 : 0)),
  					      tb->rbytes,
  					      snum012 + LR_SHIFT_FLOW, FLOW);
-			if (lrnver > lrnver1)
-				lrset = LR_SHIFT_FLOW, lrnver = lrnver1;
+			if (lrnver > lrnver1) {
+				lrset = LR_SHIFT_FLOW;
+				lrnver = lrnver1;
+			}
  		}

  /*

Use semicolons and braces.

Signed-off-by Joe Perches <[email protected]>

---
 lib/zlib_deflate/deftree.c | 49 +++++++++++++++++++++++++++-----------

 1 file changed, 35 insertions(+), 14 deletions(-)

lib/zlib_deflate/deftree.c +20 -5

index a4a34da512fe..e358053bdb15 100644
@@ -217,10 +217,22 @@ static void tr_static_init(void)
      /* Construct the codes of the static literal tree */
      for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
      n = 0;
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
+    while (n <= 143) {
+        static_ltree[n++].Len = 8;
+	bl_count[8]++;
+    }
+    while (n <= 255) {
+        static_ltree[n++].Len = 9;
+	bl_count[9]++;
+    }
+    while (n <= 279) {
+        static_ltree[n++].Len = 7;
+	bl_count[7]++;
+    }
+    while (n <= 287) {
+        static_ltree[n++].Len = 8;
+	bl_count[8]++;
+    }
      /* Codes 286 and 287 do not exist, but we must include them in the
       * tree construction to get a canonical Huffman tree (longest code
       * all ones)

@@ -378,7 +390,10 @@ static void gen_bitlen(
      for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
          n = s->heap[h];
          bits = tree[tree[n].Dad].Len + 1;
-        if (bits > max_length) bits = max_length, overflow++;
+        if (bits > max_length) {
+            bits = max_length;
+	    overflow++;
+        }
          tree[n].Len = (ush)bits;
          /* We overwrite tree[n].Dad which is no longer needed */

lib/zlib_deflate/deftree.c +1 -1

@@ -497,7 +512,7 @@ static void build_tree(
       * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
       * heap[0] is not used.
       */
-    s->heap_len = 0, s->heap_max = HEAP_SIZE;
+    s->heap_len = 0; s->heap_max = HEAP_SIZE;

     for (n = 0; n < elems; n++) {
         if (tree[n].Freq != 0) {

lib/zlib_deflate/deftree.c +0 -0

@@ -583,7 +598,10 @@ static void scan_tree(

     int max_count = 7; /* max repeat count */
     int min_count = 4; /* min repeat count */

lib/zlib_deflate/deftree.c +4 -1

-    if (nextlen == 0) max_count = 138, min_count = 3;
+    if (nextlen == 0) {
+        max_count = 138;
+	min_count = 3;
+    }

     tree[max_code+1].Len = (ush)0xffff; /* guard */

     for (n = 0; n <= max_code; n++) {

lib/zlib_deflate/deftree.c +3 -3

@@ -602,11 +620,11 @@ static void scan_tree(
          }
          count = 0; prevlen = curlen;
          if (nextlen == 0) {
-            max_count = 138, min_count = 3;
+            max_count = 138; min_count = 3;
          } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
+            max_count = 6; min_count = 3;
          } else {
-            max_count = 7, min_count = 4;
+            max_count = 7; min_count = 4;
          }
      }
  }

@@ -630,7 +648,10 @@ static void send_tree(

     int min_count = 4; /* min repeat count */

     /* tree[max_code+1].Len = -1; */ /* guard already set */

lib/zlib_deflate/deftree.c +4 -1

-    if (nextlen == 0) max_count = 138, min_count = 3;
+    if (nextlen == 0) {
+        max_count = 138;
+	min_count = 3;
+    }

     for (n = 0; n <= max_code; n++) { curlen = nextlen; nextlen = tree[n+1].Len;

lib/zlib_deflate/deftree.c +3 -3

@@ -654,11 +675,11 @@ static void send_tree(
          }
          count = 0; prevlen = curlen;
          if (nextlen == 0) {
-            max_count = 138, min_count = 3;
+            max_count = 138; min_count = 3;
          } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
+            max_count = 6; min_count = 3;
          } else {
-            max_count = 7, min_count = 4;
+            max_count = 7; min_count = 4;
          }
      }
  }