瀏覽代碼

drivers/platform/x86: Adjust confusing if indentation

The assignment of ret to -EIO appears to only make sense if the branch that
it is aligned with is executed, so move it into that branch.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r disable braces4@
position p1,p2;
statement S1,S2;
@@

(
if (...) { ... }
|
if (...) S1@p1 S2@p2
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

if (p1[0].column == p2[0].column):
  cocci.print_main("branch",p1)
  cocci.print_secs("after",p2)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Julia Lawall 15 年之前
父節點
當前提交
2e0ee69c21
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      drivers/platform/x86/asus_acpi.c

+ 4 - 2
drivers/platform/x86/asus_acpi.c

@@ -938,10 +938,11 @@ static int set_brightness(int value)
 	/* SPLV laptop */
 	/* SPLV laptop */
 	if (hotk->methods->brightness_set) {
 	if (hotk->methods->brightness_set) {
 		if (!write_acpi_int(hotk->handle, hotk->methods->brightness_set,
 		if (!write_acpi_int(hotk->handle, hotk->methods->brightness_set,
-				    value, NULL))
+				    value, NULL)) {
 			printk(KERN_WARNING
 			printk(KERN_WARNING
 			       "Asus ACPI: Error changing brightness\n");
 			       "Asus ACPI: Error changing brightness\n");
 			ret = -EIO;
 			ret = -EIO;
+		}
 		goto out;
 		goto out;
 	}
 	}
 
 
@@ -953,10 +954,11 @@ static int set_brightness(int value)
 					      hotk->methods->brightness_down,
 					      hotk->methods->brightness_down,
 					      NULL, NULL);
 					      NULL, NULL);
 		(value > 0) ? value-- : value++;
 		(value > 0) ? value-- : value++;
-		if (ACPI_FAILURE(status))
+		if (ACPI_FAILURE(status)) {
 			printk(KERN_WARNING
 			printk(KERN_WARNING
 			       "Asus ACPI: Error changing brightness\n");
 			       "Asus ACPI: Error changing brightness\n");
 			ret = -EIO;
 			ret = -EIO;
+		}
 	}
 	}
 out:
 out:
 	return ret;
 	return ret;