From patchwork Wed Feb 12 10:02:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 864949 Received: from MA0PR01CU009.outbound.protection.outlook.com (mail-southindiaazolkn19010011.outbound.protection.outlook.com [52.103.67.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C82D205E1B; Wed, 12 Feb 2025 10:02:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.67.11 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739354534; cv=fail; b=EeeE3AYwadxOUYCat5clyEyDqex1BgsVulN28FD1fynwwJEZstpNLH3m+6MwbTZBWHPH91WoapFkgXtDTHXtPPGOh4rgG88yjU6/hmdimsL0nOaJMni6BtSX6OELcpWFgKG/JqthEj0QXTnpMWYa8L4A/A1myQSN2ZnI/VIloR4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739354534; c=relaxed/simple; bh=HqwQ/rPQquzdarvfs9qLkJcGq/qtWqi5DTRuO4yt0+g=; h=From:To:CC:Subject:Date:Message-ID:Content-Type:MIME-Version; b=kN6rCM2mI2iGxZyG70b1octnujLKFNBYTNNdAvdWnkDIbWq9fbmBrivr15g/kJeRzVcUKGq48rg82ZhLE7kYFPe70tUtBGfwXtfLZGqdqZUm7+sVx3hYrrJjw9AG8VSnnh8gfG75WPCby1zlK/EBTs/URk+7zx23yjvC+iCcgMw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com; spf=pass smtp.mailfrom=live.com; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b=l5A1RZ//; arc=fail smtp.client-ip=52.103.67.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=live.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b="l5A1RZ//" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xQOtwutFI/ys+Y+l1qbw4hR/RcyaP4zQ6yestwbPgQTV6sNOh7Ouio5Ly8mVFBWzGDGWSPRBThodhCjc8S3Ui0tLl3nKJMD8y44dPTVturY997RHpU2hKkqZCA/vlBNHpBP5BbVThSwmMgjqL9YjswAK8kgblkpUFXsKcmyLWDfwbiD6rpO8MZ5XJe/D26vyvVBHEOu/eNWkFSJxvg5+EMdvKNlM5bAiLygZyMHb5MIUjkbamcwT9lJTJPUA+OnkX/BdsP/IPx5sJDWjJ7lbic97A8IMjpwYeT6aqLc/qMtkT5Iwa4mLBcCNo8bQmcpZ+NrSjfH9kzP8ug/Fa/u0sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HqwQ/rPQquzdarvfs9qLkJcGq/qtWqi5DTRuO4yt0+g=; b=LZrM4pt82v6Ue0mivIucRUwwiOKApOSUuS7I22Jm39kFYuqPxqWrSzzyMeZOTmchRXE33bXkrCLSQtr6W6CSdjWTO2k2nrTg96k2SDmP5CDDOxnP7lYOhf4WESgvQ+MrAz2cpIbSj3ZJVbu4ZCekY1/DRXC5JgGWDi0LprGP/yKHR4ugW3/B2/rWPymFSGIoJpZfsYTgafMwE+reFcSXrIzV1XjTWRAq4QNyRQJ2mhg31DtyNXPmmLKwyeJb1A2mTJ2O6hQK8H5pfVxDF2ryb+sYA/GTyssQAQc4mPR9nMtfMSzgKjdJcdt/AqkPi+CAAS15JQUE95faCO9EIC7w8A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HqwQ/rPQquzdarvfs9qLkJcGq/qtWqi5DTRuO4yt0+g=; b=l5A1RZ//JtSh99c+y2C4b1RezWg230f51U3DBxR9fNgTL3PgUYAMLisnyP+yUOL8HYlLFN3jKFzUniDj/w4FRWRS19uCqfZ1Ce2NTrcvkj/eGZAQaervJ5QToLjRqobyk2egv3peL0dpQ/GW2GktiaNCdm8XWwemHANWJo1ff1Ndc/EX+17rICO2amc1/riswt9l/aMjL1OB5h8btkJZg1+PQUjAqanLMak+j+JKKDiqyF5FdJutv/eHpSbJm3cxf5+nABNfBGFVt4VR/3viO0qvuoVvSApcKeKpUAzsO2NyBX9JC2+Fug87MEPNHcMXbgkl67/WNY3rHZhIiLhp9Q== Received: from PN0PR01MB9608.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:110::10) by PN2PPF10DD11BE6.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c04:1::585) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8422.15; Wed, 12 Feb 2025 10:02:01 +0000 Received: from PN0PR01MB9608.INDPRD01.PROD.OUTLOOK.COM ([fe80::972:abe8:752:bbde]) by PN0PR01MB9608.INDPRD01.PROD.OUTLOOK.COM ([fe80::972:abe8:752:bbde%5]) with mapi id 15.20.8422.015; Wed, 12 Feb 2025 10:02:01 +0000 From: Aditya Garg To: Jiri Kosina , "jkosina@suse.com" , Benjamin Tissoires , "bentiss@kernel.org" CC: Orlando Chamberlain , Kerem Karabay , Linux Kernel Mailing List , "linux-input@vger.kernel.org" Subject: [PATCH 1/2] HID: hid-appletb-kbd: simplify logic used to switch between media and function keys on pressing fn key Thread-Topic: [PATCH 1/2] HID: hid-appletb-kbd: simplify logic used to switch between media and function keys on pressing fn key Thread-Index: AQHbfTUoyx1vQm+EHkSaO2M+WOzzfA== Date: Wed, 12 Feb 2025 10:02:01 +0000 Message-ID: <588AFB72-03C9-4EC6-853B-3F4C362B7AA7@live.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN0PR01MB9608:EE_|PN2PPF10DD11BE6:EE_ x-ms-office365-filtering-correlation-id: 59b6f5d8-b3fd-4a66-b06e-08dd4b4c4b77 x-microsoft-antispam: BCL:0; ARA:14566002|8062599003|19110799003|15080799006|7092599003|8060799006|461199028|440099028|3412199025|102099032; x-microsoft-antispam-message-info: =?utf-8?q?yBKlh+z5LluHt0PK54TF/QYArxYB1aK?= =?utf-8?q?qZM56fH5DJlzuHJkVU3L3HuPyvjbv4ueNnCweAV7tAdcn+VZJZ5vvfmhZmrPm/VQ5?= =?utf-8?q?AUThH+ygHNIao7TbxtqJa3+gYfONkD0b/wDuw5aU+WCdfEygs1UUGKr/XPiEwgDwB?= =?utf-8?q?x/1OQgz9rwrWEQlofkHr7UgVHqFWsM+QKA9+MXRelqraUMzTst+YENqOoNcDiQKVm?= =?utf-8?q?fUOSAwyrS+GcFjKWCJqNXaj8d+NZJG+gpW4GTqvOqItL2gVenztoJWgwPN8u+6dME?= =?utf-8?q?hpp3tZLecWYweCfka1kIIjqIy9BuY/yMCsUS24TNfYQfgq8yPy9kxpAdjPH1Ww+3P?= =?utf-8?q?XJd2PiuYrEDW9jRzOI3qEYtkM3T0ZHSvwlZ5y4GJyQFrp1T7RrzqmkZY4Y9QAsi2G?= =?utf-8?q?gSCxzKxAJ8kFshvGwlDjMKwqOQ7GRcEdjUhdGOC17BVbDfjf1nV+fHP52qNRyhkja?= =?utf-8?q?Ax/KU7ZkA1BWLDN9WQgCHF/IcrCf17iYhUI56yvSVAsyQCWvhYtFEDlJmVAhDTz9n?= =?utf-8?q?Cmzz+FVQCgnyQb/cHHQWHrtXFFOgkqbdcBONeMvMA+/pZqrpE1TahKdw7YkKocfD1?= =?utf-8?q?inDQUOCSqzvabwqVLQFDIBpCsQhYP6l1myotjxANy35o3+vD1EhCTyA6JjZe6Oru5?= =?utf-8?q?7+9Otyc/SUoiPrHqB/dO4IAGrnrpd1773vanSStVzTzXW83O1IHweN1PTNP8Dpkcq?= =?utf-8?q?4J6ryN9ywIu07id2eFidvubjSRWHEncrCmadji9ZNXGP8HpBEVwLcDIXG6volk0xf?= =?utf-8?q?T7hIKkCLo2oei6mRCwdZLZ1hPusDR5F5xumPaEHz83UOhuvCtnG7fkGeN0xl6yflR?= =?utf-8?q?l7wCX5UaSCi4ykClW6EeuO092UXjj3Y9ZaPqVP+PqH6bJMU/8wPuPkFgo/2CX1Pzj?= =?utf-8?q?tiDtbzAkqW9R3qZBfRZs+R9B2SCqZ0ut/cXHfqNFaYzKPLSuaMpe1dVKLz0QhlnhD?= =?utf-8?q?UlunLvF1+WHMTmLKXS03gpKPFcZ/Zmlk3WqTkeG5kdiwwI8P/z5D4ebqQKySbp82D?= =?utf-8?q?2tNpHEp2FiVSNu5g93/V3E7AWX9z4cvNm1q1JaQ=3D=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?tuT1yvnlZBYLGOfk1m0G/NPpKWFz?= =?utf-8?q?NfAJVU0LDKpFvbh6S7kxW0lThaNjB85AOEoNOkarR/slH9xtGMI/27mSHypNt+PPn?= =?utf-8?q?rZ6Ma/DfsZo3CyLh9uupG8RVgczFk6v+SoevbXfydsf69tQTO2F1xY4aHvDiSzBrg?= =?utf-8?q?WCnY7Ai+FDDxJKp7DdvWbypvQ+MkW/Revhj5VFn9YYGmVkvU331sjkbaRJXLf/9G/?= =?utf-8?q?yylXrCFMjm+3U0am3b8xGB1FQhE/sXrIC2RYCorJvHkAqTAVvKA92IHmNnQEHucqB?= =?utf-8?q?rS3bi1LVyzalhv5NSp4A347TCejifiRDM0QrWTvhAazzRgcKtGrht4ppOh8LyW6c3?= =?utf-8?q?bBkEMMcmOkrSIlnvZfLpoRaWvZgWgAUkK5IywbPAJBTMN6ZdWp2F7Stnx0Cj4AEBy?= =?utf-8?q?uTl4txuNq2iYpIo+DvD4F0FnsH4bWiwTGR2wYbryoFZNzBW63wqnxnNT0gBmaJBEs?= =?utf-8?q?XnNK/GTp4m8u5Dp75MLiBOXbIdnFTTP7Wu6HUBMZNg1w1nIpgmSFy4ggig5+8ugyQ?= =?utf-8?q?lb0hpBO/Crsfixx3oAuIFc3l19FMVD+OsKfwtRoVjUse/l+yKcl4oZf+92LFbnyEs?= =?utf-8?q?glwclyfMvY039RGc1Fg314VOxyy2pNNMxH2h7B/yO5WWpvXsIu5TUxSvFuHcI0vU7?= =?utf-8?q?DFJl8bJGOvj5FZ/zVa1rBLNKrnhEY62A3DQB+HfHBRqUl87d04KTgTueVFYjO+boH?= =?utf-8?q?u4RH2S/0k+Cg/0OQRGi1nWvKfblrUUHVmAJANOVyRHgzzJKtbZ1WYXAxGImcc+gJI?= =?utf-8?q?IbzsTQjd4Ky9Qu7rfiqsnBfnAOV/AxmXdTHitlxdd0CMDAjSfAF1MpqefuU1G1Go6?= =?utf-8?q?Dmm0fjFPKxpizwmZ0SLGl323ySjNkgBq4D4OuuZ0clVU1CRnT4Us3Ytv9gPG35k93?= =?utf-8?q?7O9YEMIYS9ttCQtFb3bXPxpPED2lV6kgUCp5+BNxQ7AoMYtBQZXy4J0sky41ru7AN?= =?utf-8?q?KtOuM1B/o3FnbZGFn3aWKuFs6yZNdty4e8PG62Yc1GXO0yMNQcEoWUtr+zmEbLhbc?= =?utf-8?q?hegRBRxh3XdFOm+e75tWBcmleXSWF5Myxnv2/Utdhswr0w/hP1Zr+pqEnpzuSx7KI?= =?utf-8?q?X3recI1geVScj4STy/l+LFu3KmER7ehavoQ+6L2dU8sLipRHbiZDcM8KsTQzpyEJ/?= =?utf-8?q?pKRFegc3yJxXz4qrtwJBBKr3xghAk5ukDvalZhXMQbl32QpBlBK1cAUvnF3RFIwhF?= =?utf-8?q?5b1NtjteVhzGB13FoJJkr8qs1nNP2v3imvQrar1k+TZyluZtZctZpfJK47MSUmN3C?= =?utf-8?q?OHF5RxmmA8v2ggBY?= Content-ID: <7E5734B7F36DD044A3087F6678381EA5@INDPRD01.PROD.OUTLOOK.COM> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN0PR01MB9608.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 59b6f5d8-b3fd-4a66-b06e-08dd4b4c4b77 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Feb 2025 10:02:01.2198 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN2PPF10DD11BE6 From: Aditya Garg This commit simplifies the logic in appletb_kbd_inp_event used for switching between the media and function keys on pressing the fn key. We now also prevent touching the kbd->saved_mode variable in case the esc key only mode is chosen. A small comment style error has also been fixed and I have added myself to MODULE_AUTHOR. Signed-off-by: Aditya Garg --- drivers/hid/hid-appletb-kbd.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/hid/hid-appletb-kbd.c b/drivers/hid/hid-appletb-kbd.c index 38fc0e58c..c248ce825 100644 --- a/drivers/hid/hid-appletb-kbd.c +++ b/drivers/hid/hid-appletb-kbd.c @@ -236,13 +236,13 @@ static void appletb_kbd_inp_event(struct input_handle *handle, unsigned int type reset_inactivity_timer(kbd); - if (type == EV_KEY && code == KEY_FN && appletb_tb_fn_toggle) { + if (type == EV_KEY && code == KEY_FN && appletb_tb_fn_toggle && + (kbd->current_mode == APPLETB_KBD_MODE_SPCL || + kbd->current_mode == APPLETB_KBD_MODE_FN)) { if (value == 1) { kbd->saved_mode = kbd->current_mode; - if (kbd->current_mode == APPLETB_KBD_MODE_SPCL) - appletb_kbd_set_mode(kbd, APPLETB_KBD_MODE_FN); - else if (kbd->current_mode == APPLETB_KBD_MODE_FN) - appletb_kbd_set_mode(kbd, APPLETB_KBD_MODE_SPCL); + appletb_kbd_set_mode(kbd, kbd->current_mode == APPLETB_KBD_MODE_SPCL + ? APPLETB_KBD_MODE_FN : APPLETB_KBD_MODE_SPCL); } else if (value == 0) { if (kbd->saved_mode != kbd->current_mode) appletb_kbd_set_mode(kbd, kbd->saved_mode); @@ -497,10 +497,11 @@ static struct hid_driver appletb_kbd_hid_driver = { }; module_hid_driver(appletb_kbd_hid_driver); -/* The backlight driver should be loaded before the keyboard driver is initialised*/ +/* The backlight driver should be loaded before the keyboard driver is initialised */ MODULE_SOFTDEP("pre: hid_appletb_bl"); MODULE_AUTHOR("Ronald Tschalär"); MODULE_AUTHOR("Kerem Karabay "); +MODULE_AUTHOR("Aditya Garg "); MODULE_DESCRIPTION("MacBookPro Touch Bar Keyboard Mode Driver"); MODULE_LICENSE("GPL");