]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
asus_acpi: fix coding style to improve readability
authorAxel Lin <axel.lin@gmail.com>
Tue, 20 Jul 2010 22:19:42 +0000 (15:19 -0700)
committerMatthew Garrett <mjg@redhat.com>
Tue, 3 Aug 2010 13:48:58 +0000 (09:48 -0400)
In the case of no match ( hotk->model == END_MODEL ), the only posible
case to return 0 is to have a Samsung P30 detected.  This patch improves
readability by moving related code after if/else clause to be inside if
clause.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Corentin Chary <corentincj@iksaif.net>
Cc: Karol Kozimor <sziwan@users.sourceforge.net>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Len Brown <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
drivers/platform/x86/asus_acpi.c

index ae0914d4e02ea9df8ba2a59726e3bc430a66a1bb..e058c2ba2a1585cf3a81442c845906b24fcc225b 100644 (file)
@@ -1330,6 +1330,9 @@ static int asus_hotk_get_info(void)
                        hotk->model = P30;
                        printk(KERN_NOTICE
                               "  Samsung P30 detected, supported\n");
+                       hotk->methods = &model_conf[hotk->model];
+                       kfree(model);
+                       return 0;
                } else {
                        hotk->model = M2E;
                        printk(KERN_NOTICE "  unsupported model %s, trying "
@@ -1339,9 +1342,6 @@ static int asus_hotk_get_info(void)
                        kfree(model);
                        return -ENODEV;
                }
-               hotk->methods = &model_conf[hotk->model];
-               kfree(model);
-               return 0;
        }
        hotk->methods = &model_conf[hotk->model];
        printk(KERN_NOTICE "  %s model detected, supported\n", string);