From patchwork Mon Feb 17 04:43:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 866288 Received: from MA0PR01CU012.outbound.protection.outlook.com (mail-southindiaazolkn19011028.outbound.protection.outlook.com [52.103.67.28]) (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 959CE15C0; Mon, 17 Feb 2025 04:44:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.67.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739767444; cv=fail; b=hgO7/oesYpfRjTVQo0cDC1cVTEe5LA9ChLk/SNlB7vHMy+IvuXVe0gwjRa6OcHGlTHWqrjvYmMmZfWC6jjKI/Y6h2Mr68ybUJZZYej9oGyKBDvXb4SpLCEmNKYst0INxg/kv3B7VJWYStxGvLTsQG1AZzyEPs3bvfoWsqS/0wGE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739767444; c=relaxed/simple; bh=YHlhb1ZKOY3KaiRMpdTotOYDHecZ8op+Sb3TGH9ji6Y=; h=From:To:CC:Subject:Date:Message-ID:Content-Type:MIME-Version; b=FC003lOQo1nAhvTB28XIp7UMztbISrNB/nRVA4gqYL556KyRf55i6NgplDhXL5zWLv4lzIGCRD2M9BDuPevVqZw9C9RM7MAQdW4LScsRV0uFU88iPAXtIO/a0vjZ4ptDn2eqbMv+CUIJwuNYRQN5mkWSYzi76kxcAqKroswjJhQ= 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=YBWvVC+0; arc=fail smtp.client-ip=52.103.67.28 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="YBWvVC+0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=c20cgKNluBuoYnY2St0KiQMaJDa3OgPLVQW5YKXyt9Chvtwt9EcK2b3dhFlwHuSruQFDa6vcfvTcxSeoJ3Ij5mlfp+44dxI8JC2jcVpSR51y1rqkM1PBEX+ZIaeC4UgGSXLe1irfIERQwyrN5FfkFl3vVvmb6lb8yz/IqBXlUEUOKfpYHvPKMqVc4VF+anGinaHvY3fh7EVV8TxVeaVk8S4MNUepP0PcvSGwv/TKJrWV3p01PTWVYVf5nMRWGrZmtMz4Rnxdhbby/7KqxAgu5/LS4uZOJTG/NeTvtRzbMyp0ux7DTEPyJSWHoVccW5zilt2Rj875aVm7L8EhdQRWzw== 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=YHlhb1ZKOY3KaiRMpdTotOYDHecZ8op+Sb3TGH9ji6Y=; b=Gx0G75trn/AhCw90T/L6cjPvuTDD9cohI9dBs75/doq346Gm+H4vr05tIQCkI5yZi+VxCpZp2TLfEEYP6w4jVqv2//sq5cZPpft4UYg3HtTfctBVowgZZCjRGyoTXpPR7DXtxHolROcmuEm7qRjYSxUjkiLwjsVAwrlY7GxItGwE7TabxaC07c3jloBwmgGK1tz6VepC74G/umSyqAH4QFXCOEdkj7aHskyFZJC6LIXMWCy80HQWIUZHtLzOBVWWSEyQfJLCMCxcq96QlEeGBE8ZJ7oIUdQUyazRdBIjMF56Vhp8CO0WPGrI0Ca79TNjHcl9DSUouO+feeyh15ojpA== 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=YHlhb1ZKOY3KaiRMpdTotOYDHecZ8op+Sb3TGH9ji6Y=; b=YBWvVC+0bJpUb/zT2wstI4NUTHO6zY+nctIzBuMJrmq8mlnpCV5ZXqxCy6rChfSngnqu60V7An0NFrJOzrtgfAtHttFpIM5VgwC8fotRR7ZrHLS3pN4VfSTKHZ3EhpitEZltqeGKq7rjowVO9fpCblCiCRQ81fEP77/zjLIRpf9y9MrQ5OPx507ndHnIzjZR4wWII7JG4sjk9mbSQvndPrw6kWrdzdhBWDJmCpMi7Ve/lL87APVpaA4Lzj2YC/RyMWAfiuObUzUJWmnzRWVHd0XT753PMzNyJaia1SvMKmT4gW6ckIl3KHIHZM7gQiOukmjZFuif3VKWiQIL/+pAQg== Received: from PN0PR01MB9608.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:110::10) by PN3PR01MB7015.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:ab::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Mon, 17 Feb 2025 04:43:57 +0000 Received: from PN0PR01MB9608.INDPRD01.PROD.OUTLOOK.COM ([fe80::972:abe8:752:bbde]) by PN0PR01MB9608.INDPRD01.PROD.OUTLOOK.COM ([fe80::972:abe8:752:bbde%6]) with mapi id 15.20.8445.017; Mon, 17 Feb 2025 04:43:57 +0000 From: Aditya Garg To: Jiri Kosina , "jkosina@suse.com" , Benjamin Tissoires , "bentiss@kernel.org" , Dan Carpenter CC: Orlando Chamberlain , Kerem Karabay , "linux-input@vger.kernel.org" , Linux Kernel Mailing List Subject: [PATCH v4 1/3] HID: hid-appletb-kbd: simplify logic used to switch between media and function keys on pressing fn key Thread-Topic: [PATCH v4 1/3] HID: hid-appletb-kbd: simplify logic used to switch between media and function keys on pressing fn key Thread-Index: AQHbgPaN5rsIxIjWmES8Fil+QZv1mA== Date: Mon, 17 Feb 2025 04:43:56 +0000 Message-ID: <8365C1B3-3A38-4F6E-955B-D6BBABA6B00A@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_|PN3PR01MB7015:EE_ x-ms-office365-filtering-correlation-id: 1429c17c-8fff-40c4-bc5f-08dd4f0db07a x-microsoft-antispam: BCL:0; ARA:14566002|8062599003|19110799003|7092599003|8060799006|461199028|15080799006|440099028|3412199025|102099032; x-microsoft-antispam-message-info: =?utf-8?q?oBIrwHSG0Ak2TIPTH0tAk/Pz6cDKrsF?= =?utf-8?q?G0Y9TJBz/ocTNSJbFCr5Xe4Ud43z8/Qh3JDQyXgXs9MIb+w/QqvcVGr3wK+O5Et4V?= =?utf-8?q?QdDMaoeKhvjpytccT2gYogeP3bOht7EIT7wkL5ppRHMVQZPLww+hmj+dvfEPJ1Sh6?= =?utf-8?q?mRYaPYtW3BCOyN6ZW3Uuja1BgOd9pVKoX1rS57Z555VrGY2dTawwl4Oc4J2JHeui2?= =?utf-8?q?pfPhgpA0PtIZnnZRF9FgbCjUjZu21OmKnVlg9RktUxR+hEJ5RnNyQQkncpHNO/Svg?= =?utf-8?q?nbxUf/sYHsgHSlXyY36zOWKT/Fu1vDJtIk1a+No/39Qahe3d5r+DkiV690GW/Q+ti?= =?utf-8?q?8PWUqyAo1eoVKzFfvZuBDK/Hy4MaDseZcBIX8rffTqmzDb7qLP8uCbOYK9ndkE/+/?= =?utf-8?q?/jK01pA8fdVHiWf655hpfzSOvn2z7mDCzaWzl+83R/jekKOAOx4Zn8qBbV9BGPtno?= =?utf-8?q?leeeOC60XS5bKCdMnd8LePImA3DxEOUERionaYPYh6J5sec1QxX0eK8nfquEaaa4n?= =?utf-8?q?Fb5mbQIUpVR8KXoUvgv6noKvxNSnqxBy2KcBTuN65ZqFMhRcR+Tyw172+F8OuJAti?= =?utf-8?q?3baBgRjAzcHNVs3Lh1goJkWvt5HyterHnUIYxm4sR82olBPWj6h1e3QPhLtEa5IOA?= =?utf-8?q?Eom0vmBk0dT8AnUVWvrJ/w7CrF4l9rka+myE4ZZ0lyPgUunpKZ1v6EZ6oZwIZrAp0?= =?utf-8?q?nKjjvhqlj2YNXohSfXngMyZYeJVMBL3S5fFT2pIV6cR3naJUUt0gGowicZiaqar/J?= =?utf-8?q?Oz/QOvdhKjhBYLavY66SGxuiqf6y2GyfugsYyUn6oYaV6JjRkRVN5qfaU+AZSNtT1?= =?utf-8?q?FDMcT0GosYhOryDKkU2ehY16t5kdSHPIdZoFXy40APgJwYSavi0Xxcs3Na83VpmYz?= =?utf-8?q?hwrerMlDFyM//DWyN0tjYZbEyoHPIaCxst325P7k6eQymkpbn2L0nCot3HJUrBTsK?= =?utf-8?q?yvvqV0vMvfl5v1FvmGZ3TFziRE68iKaGEqOT2d4XUxAVjBbSfzjyIKit+FgOETj5v?= =?utf-8?q?t81/z8SM3pWVk1eqnGG5k77x5tr8PNW8BT6c9xQ=3D=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?81grrDGdrbYGDTYWp3tmfMm4bO1E?= =?utf-8?q?mIgTax6lDrTkaT5Ag5mlpfbFOTJY1mIXD6s3XrzHv0BZhOuIbjMvb11QzEEIQM1FO?= =?utf-8?q?1Wud+9inJjh+uzhMfVLvvsuSs3G5yZn53Owrjjch8D2Dtn70L+l4dxKorJCjVvPov?= =?utf-8?q?RBBH4YRm8VgxSgPmCmgPRm3mcR3if3MQq+Bk1YWJvkC9F8IPA76F/RauQjXWeg3uc?= =?utf-8?q?c3WUVn/5pPKoBAusHs8KQxIr/sDNuosffe9IvlDTu6MhDuVByQ+e8EDeozs6so3pm?= =?utf-8?q?xeJLNBJDGq+Cb6sB1pGrmRsvoLaqN8UiIrNO6CbwXOezsR+OJOvJqyn6ER8n9Numo?= =?utf-8?q?Q/ZNa97rXnX7tShXaEQyLCLCQkDAQpZM4Q7gS0twrG1Ndz/cp5i+ysaJoo7hQgi3/?= =?utf-8?q?RWgIjCaD4Os4FcioDWFebl7+h/W1uMDTYToji56ej8Kd4DSYSjLJA4YIggcQuKcdP?= =?utf-8?q?aTn4iQFJSXz1us1ZZfxhrZ6ry1ee9CMRCV3WR01mN4ZAE0PRPq06YnzP4zSZhFvvV?= =?utf-8?q?CoSgA4sHh8sODjviyjnKvktkGspUukZAW764aUyKgx7Oxe/kQkF4UHSF2va43QbOG?= =?utf-8?q?4qGtyd8NGSgMdnrQ72erVBEjXCkrk+NfVMBMSmZavfH6EMDaQjcP0VKrZKSijMTz1?= =?utf-8?q?lHqeMEjks0Uy7Ed9G90rFmHyl+b82KXwFyyAb8cIuvjWI3WWVR4HENVLiMgdvfKQx?= =?utf-8?q?ThA9A/8m0mZ1t1THB3R0XCvO/pevxoP1sGw7I1UORa8tL8VpCAUyzHA2W189+gcgi?= =?utf-8?q?9yJXMK5CJETDhMB9MjuWq8yig7pHW8s3FL5yUT/FZEjN3bSiZ66ZN0OfQIUNetNAm?= =?utf-8?q?fjhF/sQuv9MJLgPJ12I2JXvd48yBkLrKTBJG4SQ6dkHa0jCdCC2uyAPbAbGS6IK5W?= =?utf-8?q?zkFFXK8xGxdh4lL0JevaUQYjTU3AsviUtzjR1ax+LF1Lwym/qi/KgHNUGB2J4ZR5J?= =?utf-8?q?/Hs/drCkHanx+xa0Kcddwm47dmRhVip4MnJ9zvP4zhz19Bj7GOW3iWkJSjU8k2ghd?= =?utf-8?q?9POrTj49Dgmq4HwxwjHejxuK5Ydnea/mO+u5PNhMUEuKZ5ZWqK3aFexYbh9MK6+QF?= =?utf-8?q?MRJ5ob8u1nGABoEG3JyJM85hGhUmTDzRkT+g6jnACxvrODkYCTNFaL28JUzJy0MSU?= =?utf-8?q?CPYahyfvK2UQy7tQEd2XHlX/G4ubdMVb7VkuRRyJq6NClqdEczRXacFlx2rzKlPDF?= =?utf-8?q?bepmfef86wWy8Itg53NYtJc/hsMeDJ1+4hFp2sH79H2lMbISvGylimwNxN0ye6UjD?= =?utf-8?q?9uelDcIFmHuGNNkL?= Content-ID: 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: 1429c17c-8fff-40c4-bc5f-08dd4f0db07a X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Feb 2025 04:43:56.9850 (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: PN3PR01MB7015 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. The following small fixes have also been done in this patch: - A small comment style error has been fixed - Fixed spelling in MODULE_DESCRIPTION - I have added myself to MODULE_AUTHOR Signed-off-by: Aditya Garg --- drivers/hid/hid-appletb-kbd.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/hid/hid-appletb-kbd.c b/drivers/hid/hid-appletb-kbd.c index 38fc0e58c..e45cc3ac4 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_DESCRIPTION("MacBookPro Touch Bar Keyboard Mode Driver"); +MODULE_AUTHOR("Aditya Garg "); +MODULE_DESCRIPTION("MacBook Pro Touch Bar Keyboard Mode driver"); MODULE_LICENSE("GPL");