diff options
author | Axel Lin <axel.lin@gmail.com> | 2010-07-20 18:19:42 -0400 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2010-08-03 09:48:58 -0400 |
commit | 3bf460f7b2767df63b76257332c4a9a29d5733c1 (patch) | |
tree | b6df4aab2f729b5e4b69a265735ab56683deec3f /drivers/platform/x86/asus_acpi.c | |
parent | d47bb5b227f103f9bc0e572f478ac6b2a08fc2b2 (diff) |
asus_acpi: fix coding style to improve readability
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>
Diffstat (limited to 'drivers/platform/x86/asus_acpi.c')
-rw-r--r-- | drivers/platform/x86/asus_acpi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c index ae0914d4e02e..e058c2ba2a15 100644 --- a/drivers/platform/x86/asus_acpi.c +++ b/drivers/platform/x86/asus_acpi.c | |||
@@ -1330,6 +1330,9 @@ static int asus_hotk_get_info(void) | |||
1330 | hotk->model = P30; | 1330 | hotk->model = P30; |
1331 | printk(KERN_NOTICE | 1331 | printk(KERN_NOTICE |
1332 | " Samsung P30 detected, supported\n"); | 1332 | " Samsung P30 detected, supported\n"); |
1333 | hotk->methods = &model_conf[hotk->model]; | ||
1334 | kfree(model); | ||
1335 | return 0; | ||
1333 | } else { | 1336 | } else { |
1334 | hotk->model = M2E; | 1337 | hotk->model = M2E; |
1335 | printk(KERN_NOTICE " unsupported model %s, trying " | 1338 | printk(KERN_NOTICE " unsupported model %s, trying " |
@@ -1339,9 +1342,6 @@ static int asus_hotk_get_info(void) | |||
1339 | kfree(model); | 1342 | kfree(model); |
1340 | return -ENODEV; | 1343 | return -ENODEV; |
1341 | } | 1344 | } |
1342 | hotk->methods = &model_conf[hotk->model]; | ||
1343 | kfree(model); | ||
1344 | return 0; | ||
1345 | } | 1345 | } |
1346 | hotk->methods = &model_conf[hotk->model]; | 1346 | hotk->methods = &model_conf[hotk->model]; |
1347 | printk(KERN_NOTICE " %s model detected, supported\n", string); | 1347 | printk(KERN_NOTICE " %s model detected, supported\n", string); |