Commit cb97f5f0 authored by Hans de Goede's avatar Hans de Goede

platform/x86: thinkpad_acpi: Remove "goto err_exit" from hotkey_init()

The err_exit label just does a:
 return (res < 0) ? res : -ENODEV;

And res is always < 0 when we go there (hotkey_mask_get() returns
either 0 or -EIO), so the goto-s can simply be replaced with
"return res".
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Tested-by: default avatarMark Pearson <mpearson@lenovo.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211121191129.256713-7-hdegoede@redhat.com
parent 798682e2
...@@ -3464,7 +3464,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) ...@@ -3464,7 +3464,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
* the first hotkey_mask_get to return hotkey_orig_mask */ * the first hotkey_mask_get to return hotkey_orig_mask */
res = hotkey_mask_get(); res = hotkey_mask_get();
if (res) if (res)
goto err_exit; return res;
hotkey_orig_mask = hotkey_acpi_mask; hotkey_orig_mask = hotkey_acpi_mask;
} else { } else {
...@@ -3500,8 +3500,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) ...@@ -3500,8 +3500,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
TPACPI_HOTKEY_MAP_SIZE, GFP_KERNEL); TPACPI_HOTKEY_MAP_SIZE, GFP_KERNEL);
if (!hotkey_keycode_map) { if (!hotkey_keycode_map) {
pr_err("failed to allocate memory for key map\n"); pr_err("failed to allocate memory for key map\n");
res = -ENOMEM; return -ENOMEM;
goto err_exit;
} }
input_set_capability(tpacpi_inputdev, EV_MSC, MSC_SCAN); input_set_capability(tpacpi_inputdev, EV_MSC, MSC_SCAN);
...@@ -3582,9 +3581,6 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) ...@@ -3582,9 +3581,6 @@ static int __init hotkey_init(struct ibm_init_struct *iibm)
hotkey_poll_setup_safe(true); hotkey_poll_setup_safe(true);
return 0; return 0;
err_exit:
return (res < 0) ? res : -ENODEV;
} }
/* Thinkpad X1 Carbon support 5 modes including Home mode, Web browser /* Thinkpad X1 Carbon support 5 modes including Home mode, Web browser
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment