Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2e0ee69c214a0197e1b081ffec9c409ab2a5f094

Authored by Julia Lawall
Committed by Matthew Garrett
1 parent 5629236b31
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

drivers/platform/x86/asus_acpi.c
Diff comments   View file @ 2e0ee69
... ... @@ -938,10 +938,11 @@
938 938 /* SPLV laptop */
939 939 if (hotk->methods->brightness_set) {
940 940 if (!write_acpi_int(hotk->handle, hotk->methods->brightness_set,
941   - value, NULL))
  941 + value, NULL)) {
942 942 printk(KERN_WARNING
943 943 "Asus ACPI: Error changing brightness\n");
944 944 ret = -EIO;
  945 + }
945 946 goto out;
946 947 }
947 948  
948 949  
... ... @@ -953,10 +954,11 @@
953 954 hotk->methods->brightness_down,
954 955 NULL, NULL);
955 956 (value > 0) ? value-- : value++;
956   - if (ACPI_FAILURE(status))
  957 + if (ACPI_FAILURE(status)) {
957 958 printk(KERN_WARNING
958 959 "Asus ACPI: Error changing brightness\n");
959 960 ret = -EIO;
  961 + }
960 962 }
961 963 out:
962 964 return ret;