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

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

drivers/platform/x86/thinkpad_acpi.c

+2 −6
Original line number Diff line number Diff line
@@ -3464,7 +3464,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) 
		 * the first hotkey_mask_get to return hotkey_orig_mask */

		res = hotkey_mask_get();

		if (res)

			goto err_exit;

			return res;



		hotkey_orig_mask = hotkey_acpi_mask;

	} else {
@@ -3500,8 +3500,7 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) 
			TPACPI_HOTKEY_MAP_SIZE,	GFP_KERNEL);

	if (!hotkey_keycode_map) {

		pr_err("failed to allocate memory for key map\n");

		res = -ENOMEM;

		goto err_exit;

		return -ENOMEM;

	}



	input_set_capability(tpacpi_inputdev, EV_MSC, MSC_SCAN);
@@ -3582,9 +3581,6 @@ static int __init hotkey_init(struct ibm_init_struct *iibm) 
	hotkey_poll_setup_safe(true);



	return 0;



err_exit:

	return (res < 0) ? res : -ENODEV;

}



/* Thinkpad X1 Carbon support 5 modes including Home mode, Web browser