From patchwork Sat Feb 15 18:38:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 13976216 X-Patchwork-Delegate: jikos@jikos.cz Received: from PNYPR01CU001.outbound.protection.outlook.com (mail-centralindiaazolkn19010011.outbound.protection.outlook.com [52.103.68.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 43DA61AAA1E; Sat, 15 Feb 2025 18:38:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.68.11 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739644736; cv=fail; b=QeXFJ5jr1abcYD3n3184cD1VmjevfcWebKvZ9PT3nlfTpw67aPd+Tx6BreQdt304WEADbWbV8enFHH5ZJe+Y50ImKU3byBiphjXvWVRW5v+lbYCQ44Z9bvZ/rNjPd2y4IsAKv0LzGyhGp3yWZiIltOwj1RSdRqGw7huZpWnsRcs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739644736; c=relaxed/simple; bh=YHlhb1ZKOY3KaiRMpdTotOYDHecZ8op+Sb3TGH9ji6Y=; h=From:To:CC:Subject:Date:Message-ID:Content-Type:MIME-Version; b=OBrZDgFnw/G/shOjFYK2nitcghJsu1R4rqRcETOmsBVG1pyYPLME6YPd8SHo9COljE1cobYmPkj0ayFrwuKECt6w1ohCW/g+VRYTuUc7iLS2/nHEcTaC77AdO5Z5dyeE+KmD4tiycjF5ozP/5QRidvUivqBGN5RsdtobitZGkPI= 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=I9XHKOCE; arc=fail smtp.client-ip=52.103.68.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="I9XHKOCE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JogT++XOg/vU4Q7EpQB93LHzN2niWsf7OhTadSkedKw8Z9ieNSM43/+YiECYk/DD29S92ravFfzrlTqelyOkVYwuNp3RcHGF4bt6RU/c2YWQQhJhVRFDyWtZZ5fiEPCjK8Ey/EtSRT/kR/7Z63xBSY/BXwHhU5LEsqSILQwnFX/fXgDQDLhsAuDbyI0xYZim4RwEuRKNj1L3cD19GXZq+uVNA0WzheokZ5W8Kz9bKYE3x2iHrhBjNMTCw8Qf3XZJaKRAgC/9jMLihcf+nCUD2MadjJzARDcr444VX7lvNejblKDbvtfnwEmCYwCFqwhfwtOCFXFkRtZ9sP4hVZDSHA== 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=gokWgqhE/P3xNesuu1I1P/9P0IkE5FNqbWFN5oYHPhyGamuDlpHKpRc8wv7VorsLnkUnF5vG07jgsf3Tv1FIjjxVOz6ZgLNrEL8MYgPXE0kuzb5dYUJ12wc606hheyTTUOx9hxpfLdxB7XcxU8Wz369JffocDS4uCGgDUrDeJOWWOdP996Gg4F4uc4xHag2qPNZnb3cavhkZtU19Y8zZRaJP2FeG0tegEL5pOTuZ2wMhb8ZlYk2yJY2CU0ifk0VYyL7NVpqilusEkuQbsqdPwHDsKqFaCDuA9Yh60b6BapXqSgMPgEchFnlmhkpybMa2q0JK8G7gFBFzi0HsOgdJ9w== 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=I9XHKOCE35KyuHy7VsnE7vbYx4WhbnB7kAOl7r2CGJZZmAU1PZLLvrVfWPPUgPRT0TCVhcjtIKbckJkbB7TdJWFUfDAl5W9unv2l+EmzzddlRa4G8KmukxdBgHveBh+aAZmbqAMySpMH92jY3rkXasnzymODhLljXQX0PVRCFowqTBzcCbrDor0+0qHKc+EliK20urGgas7xqynrJE4S0yMmm2qq3UUCkHusrVdiZi7AkwlKIRhJ6GND/CHYLPT4KzL6yECugAqNlKSiARBmYHLabdOdIL4qMLAxJejx/PS4WODHYyCtlza2OZzmcRhHg7w60dXEi3AMDRrAxfbLjg== Received: from PN0PR01MB9608.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:110::10) by MA0PR01MB7817.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:2b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Sat, 15 Feb 2025 18:38:48 +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.016; Sat, 15 Feb 2025 18:38:48 +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 v3 1/3] HID: hid-appletb-kbd: simplify logic used to switch between media and function keys on pressing fn key Thread-Topic: [PATCH v3 1/3] HID: hid-appletb-kbd: simplify logic used to switch between media and function keys on pressing fn key Thread-Index: AQHbf9jYwLElU2xFu0WS0KFMqACCew== Date: Sat, 15 Feb 2025 18:38:46 +0000 Message-ID: <00768D5D-F9CB-45DA-8F5A-3E21E84A8AA8@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_|MA0PR01MB7817:EE_ x-ms-office365-filtering-correlation-id: a6ca6e74-10fb-4be8-2762-08dd4deffb6b x-microsoft-antispam: BCL:0;ARA:14566002|461199028|7092599003|15080799006|19110799003|8060799006|8062599003|102099032|440099028|3412199025; x-microsoft-antispam-message-info: =?utf-8?q?RaIKZS9C2oIhCOTYRKh4fEuX/eI/Raj?= =?utf-8?q?16OSQWr61kK89AGRBaS19jkx5w06n1jBH5+1jfSUI74ebPoEH/FjzQoQwFcsTVKT/?= =?utf-8?q?jEPhlvY7IphaNDt+oLH8p4WF4T3ccZ2aFx1MPXpyyvLfZDb+XTo1IN4khUHdFFSEI?= =?utf-8?q?TPBLoo0r+Qnf9KqED2qNwg2HVElvTnmbbwrLAEtKRvojsjFNwyRA4sQ/XvWiCWXGI?= =?utf-8?q?lwujRGSSFpD37umB7eePPoUZfj74SV0ER0FFLEj7vILcxHx8yEsNz7aFcIHJcq/0j?= =?utf-8?q?cW/YlHAzdZv2MQWtSYSuz+IzEFsE7ZTt0zGXcJD8nuLJRs8BVQvsD4bOOCARFaQAo?= =?utf-8?q?usLdE6bXvlp8tBPdYfq7M1EbCdzu/K4yP6bQSdQ84o9P/5eGMJon/RA510lRvOC9x?= =?utf-8?q?+AqpBQAtgN2Qud/3zuxrPf6IPwqt2IuWO1PRViAWVJxRjocar7+dOtJWC2umKlS6f?= =?utf-8?q?tR9T58Od96puJ1ozFwj0W/BQrt6cTpqevVfZp4jCwBaJneThV4BFqpxqs1JePx90V?= =?utf-8?q?8uXgy9GEnEXzvZgh8Ra9bBwXbEJHU0gh8/kn1JgNVJ+62Tmcwdl6bonSYPWn6QjvS?= =?utf-8?q?doRkaFRsuR2ChbbAXag/n5ILEDCzf/Azp9dpCD5T98Wt/2pVioS06wfd0YvLpDLNR?= =?utf-8?q?WZbdnUQTjLbC4MeEaIi8uNV1mChCneH4iwerYr5sWm0iR+OSKezy9JF3EDg+/46JE?= =?utf-8?q?Xm622VjsLTar5mtMb4C/3y0YQBsp/vj+HrilSx6y6v0nOPMurTvwS0y6C3Ngm/Cmf?= =?utf-8?q?8dqX526h0HCEC9DzKZLw6sVD4ShxjrY93cxasu6zbMnFkUdR/CM3zmj9lKMu1bKoN?= =?utf-8?q?vWjLa71jcnF7RJVSh4cYM0iDE1Fynzre2EwTVKjzKwG4AoPxgYpV/8JTjC6cYVGV+?= =?utf-8?q?nwvPVgr4sS9mpVXflsYm9tj1g6cUDGLcklldNSHHjtILCm1rTj/MZPGaEv9GXMY0z?= =?utf-8?q?0weO/5hQPFv4wUpmY4d9OG1Pc66AoHf9ZYN8NYSnob5ebZTaST4zwHSebg23K/iwT?= =?utf-8?q?be2Qh/aOm49xWfi+dL3U6+2M0gtCWSS0qBs2qcQ=3D=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?VQMymnCX/QTj36SwiUxUI/aYYCGo?= =?utf-8?q?eeeP06nEd24MUfm93IPTZUsXImwVQQbcsa7dyxaYOGp+CV3dENrh4rS69GoXiwbBP?= =?utf-8?q?4vsqEfLh3U3XG1/bMs0GcFh87KWl9N4s4XHWgem6jvo9AeRl2RHL5pXNZTR9aVv2G?= =?utf-8?q?gRFSRO6/AhbLUUt2oJoyUS2NkNWZ82wwRDvmIK6Bv0ULMQ/7SSS7XE+aPuQjcOY85?= =?utf-8?q?zl41SM7k8/1/xAVVo53jGFgcU+CMV9bXblek9qMDZAZZIxkZMR2gfo/YChczAe6Ka?= =?utf-8?q?S7jKl1NLU6kvXRtxRFihBxgPaxtZTVN7OS5p/tBvxmF+wjHqS23ElqHnqYm++d/lH?= =?utf-8?q?nlKZFxIEA0nmkXC4na9zdyI0UEyLbSbN+0StRBp0iPYZ5nUQSRXIUAA2JhSxiR1uP?= =?utf-8?q?ZMY+MibmKt8yvUlvFpEt4iUNO5/3ZZvg57m8Qbm9S+9uZzLwNwuWsNXwwQZiYMuGZ?= =?utf-8?q?/DikXWSYlZ77d6QwZomZEJRGTAVK4i7n6S0BpuwN9Tz7mADCdU3sy8QrbOmtOEX7c?= =?utf-8?q?c5nanJ1JqhPmhKthuVW8IJ1tQIag1/lLYhLtA6xle1d3qDAbUrcZ93OI1y/vVZ8DL?= =?utf-8?q?FLYewYZJkdz/4ieT0ooPEQYbSyLf9VAeXssPthT4Mvb/vXsau1gw38rQwEpt8Ybb3?= =?utf-8?q?BNkA4siEdSyrHkto49++pW+2ZjPQIBI2f4Y+ir4ymHGweuPdfNFCfbQyLx3r/iy6x?= =?utf-8?q?9yglDW5f1F95NIJbNc6vsx9OVaZiyNc5QpPW5P2DZ7zDU2gAOFwYy8Ac62FtuN0yr?= =?utf-8?q?pqF2H/BlfqK95WYe5FWr5i9UfrFaV8zcONyzI/VSCK3+ILLPyG6GLcyFkOKG20K//?= =?utf-8?q?nb96w3uv2EOI+QFoBjUJCV9kNQxg39kWHpUCyT6A3Cw2EfWCiL7c7Z2JXlxK4G2Ki?= =?utf-8?q?CfxbhLf4HU8JvMIa6rYG2nuYUB2XgztfOZTDdsYqGpZ1kK5EYFnACyJ2AtbW+bOLl?= =?utf-8?q?3We0y+Yb8S0gE7pdAe+dRHG4nRXBTt0EgdETnRQjs6+bNdtJ5kS9PKX8pDPeXwgYQ?= =?utf-8?q?e8U/0zK9NLuMz1H+Nv7tWrcAk+C3hOe8Ip9kAAWtsfrO0U3DpTYGV6dc/KvTQm/Pi?= =?utf-8?q?iFJXqTgjsRgX6nV4oHMwE/xOXvm2u7DS/x0URSUlJDiDcYHYFN4/5aT5TBa5tJdm0?= =?utf-8?q?11M0+z4MjXcvadNbx8DYYyRLYTGQ9XM3SpbgWLfAb+JRIK8GTY0I6JGWtSzf2REzk?= =?utf-8?q?AfAZdlJ1OBzSoqrHJiGiQ/bDqTXnruIuN7Sfw0BesaDvGao7x+NFSsxtKhdfDQwA2?= =?utf-8?q?VTb+7hGWfv6CorV/?= Content-ID: <4BEE9C48A8719A4C8920D1B840C45CD4@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: a6ca6e74-10fb-4be8-2762-08dd4deffb6b X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Feb 2025 18:38:46.7092 (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: MA0PR01MB7817 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");