From patchwork Wed Feb 12 16:09:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 864947 Received: from MA0PR01CU009.outbound.protection.outlook.com (mail-southindiaazolkn19010015.outbound.protection.outlook.com [52.103.67.15]) (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 E48CE24E4C3; Wed, 12 Feb 2025 16:09:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.67.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739376551; cv=fail; b=JTgTjT6XZh6ad/1SoIjwFZ55hd8dVLcVOagjeXsu1AzM7A3geH3lE8xI51hirDc1KlkEhXtGyoV6QCwJdPSU+xWUwfix0XDpDSqngmAsTEi+SkAoFvaR/Pcmbdu2b8HmxYVFKfy+QbpUp1gSpX1Wx/+ahXJJzi9igc6DqfNmGjo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739376551; c=relaxed/simple; bh=5NqynCM+zV5o4xPIkc1FXtMlUF8QkDU6+glk3Fkat1U=; h=From:To:CC:Subject:Date:Message-ID:Content-Type:MIME-Version; b=gSMGfe7Y8Xk18VSNisNrvOF3xjv3Pg8BorVY0XlUNNMjQIKoLtUouqYa3rzB5l6fNbzVxvobdL4kcZ8MRiohoSDvrX8XwzLdSTMRj8Vxpsl0Ci+2jj3+9FjjheqeaKrVjbuaUE7xmc6ma1uAiWpBazCd04MXCgUAjgKmpCA0kj8= 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=W4LTlJRI; arc=fail smtp.client-ip=52.103.67.15 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="W4LTlJRI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lOPm8qNPjj9++8YqnAP589MFOJYWSSm6Uki2hvtkEjWkZ4GTQJB/bedO6njKQEQm/zXGsCNcDQwiEL69HAo/H54ydaVXtbO66gSbCLszxoNUrJzX6UqQw5KbHlhc1dqmCyc4rAnS1LtWKzpJc03Qh9IH7RIAvpcoZO5jXXaPJbCjiFtj59E/RN3mR8OFkwtiyyRjkinc2cekSEo9hXI7PT+yVidY1E4sH68Zb4CRSrPsPxBj7S1oLHDfjW7URgk6ObEc4shZmweBl6je+rPLizSIMWEsRgGrZd42XBjaxLtN89XN1xS8kkHBTyck+Qgk/33AdzQeJvJ5dhJnyPMKkw== 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=5NqynCM+zV5o4xPIkc1FXtMlUF8QkDU6+glk3Fkat1U=; b=mIeaGFdNsB30kHdLnUlnGntNO8wvBD8XyP250YfhW12v4KOOYkd7lhZvsfrxts+jDL2EmdG90XW+b/YBUYpJMsN+08iK4g68427BNPTfhwUFDiqPdpOSG7oeIg45edkNw123GqV7Q+Tvo2288KmCKOBUOdoYWy32Xkd/MMZwBKLmGpGLp6khZ65/BNR4SgqBDUDfZncyfGfLWyYrW4fnZJt/yPSRYsRvSQpa0fl9R+pvXp4Av34BEAtBMTbQwbe/EPQ5P+hwuI5IP0VE7tNTxDoZf4IWxs09+SLzDzBpDhmPgapCLOwjdvpUN54JnzUz4gFZQsVD3xzp1XSRRYauqA== 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=5NqynCM+zV5o4xPIkc1FXtMlUF8QkDU6+glk3Fkat1U=; b=W4LTlJRIXreYpe451Dq5QvwwHklG8P2cYNh2IgDCjuKqng4W+PauLvWSQ3O6Ubx3pNS0EFSUT0EJKTj/3eAT1hgzzpPQ2x5mUFik5alchf/Tocj+hRSVcovvUj3w2ekchTtYyHZB3uUl0p3yOQEsU/u1JMw14svZZm6FDQmYK5wE0c/Pn6v/iTZysw3aA1CX5DuV9FkM/tUFkMbRkzsnUc9aLill+udXNJk8nH/IG8Rh/2pLZ5OLz56QxoQY1DKGw2jFkt970vGl7g5txI2o5BOAYXM5JhU5byRSnOx8xr6bRd5V+qwHLJip8MqMXGjWWzSj9OC+3/rA4nrRDe+EQA== Received: from PN0PR01MB9608.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:110::10) by PN2PR01MB9297.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:f5::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.13; Wed, 12 Feb 2025 16:09:04 +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 16:09:04 +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 v2 1/2] HID: hid-appletb-kbd: simplify logic used to switch between media and function keys on pressing fn key Thread-Topic: [PATCH v2 1/2] HID: hid-appletb-kbd: simplify logic used to switch between media and function keys on pressing fn key Thread-Index: AQHbfWhvfoTey4m/GEudYLyVuVR9Jg== Date: Wed, 12 Feb 2025 16:09:04 +0000 Message-ID: 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_|PN2PR01MB9297:EE_ x-ms-office365-filtering-correlation-id: ff5a7097-2f44-47bb-51f5-08dd4b7f9282 x-microsoft-antispam: BCL:0; ARA:14566002|8060799006|8062599003|19110799003|7092599003|461199028|15080799006|3412199025|440099028|102099032; x-microsoft-antispam-message-info: =?utf-8?q?q60QUVivIkmX5pgQ0PMtbY3xKGFQJTt?= =?utf-8?q?JMZWH3kzsTgfiesnN0Q+jgrTL2P53mq80523qX+ZwtQstrNen4je3ht1NnhXw+zli?= =?utf-8?q?WyapoWGuPdPN8zWGCZnTWIwzf4ByyxrDk04P/qn4d0XeFRnIPruAfQfozihO+QyT0?= =?utf-8?q?NoHGdgji0ZTT/aK12e0AqNb76i2YaS/+rASxnHEw6/CQ15ceI99frsm+gorhkpC7v?= =?utf-8?q?3GOEVv+cCT3BbtsyMjq5fXqo/HDCul57Q/NacoczcvL8QNDcyuXOpKjnbQ3N1vbbo?= =?utf-8?q?TXk7iKFXIw65D/yEr+/RmXqJt0WZjssev8gKanZ/eheeXrj2qamuuCIiTygJi1IWI?= =?utf-8?q?Ke+1Z8fLiup3p0cXawI+XtioQUqGsMSt3lo0vQE/goAKfj9rKNSugQCA6V140Q835?= =?utf-8?q?yFmzCjxGPpmc4lbc0phFgjgNbqWX0nXDP7BUEC8rY9kF140c9FsFSlSC09A2mePFl?= =?utf-8?q?B9ouoMX7EhZNAwEXPCetOrJ5Tc5cq3EWrWEofp2J5S164BwdpbJPwOXdvWYN4r3XU?= =?utf-8?q?ldKItfvB3BQbqH5Z9V0eovcDKrDVGYU85XN+acZpwq0Ju94hedcf6rPuFZfqQNccU?= =?utf-8?q?WMWsb2efWIbvlmu1RL48QIIU5x4cBibYDfOsoon2BghYexmgD9FTVpJQmeroiYAk1?= =?utf-8?q?wqcUdGV6GIbYlqCCcmmoU8FYyFWCnjsedri5TYCJj39dgdq/dK3siiFDOS01XszZl?= =?utf-8?q?pgI23UpczLBSIoUhl+NXwDQeEAcKnoZUhi0DopEjIUgDSsSnd/ecJDGNoQIJ26brR?= =?utf-8?q?Z7EvXgSpW/nfg8IhL4v4OFwFUdp2UusgmDxh9TeWQkMING1AFcXIkIsezbxitNz3d?= =?utf-8?q?Ip2QoPyCwcWiD3oQ9Hv7MnC89osV7xRaiLfQqNoN3s/lyJMNsStOrx0aTw0liCdca?= =?utf-8?q?DP18hk7+Yd61p+npqpd+7LXK74XeCi8uIpJ8GEiEPtt7FvAI4aX8M9khcGnw7MLzf?= =?utf-8?q?RLZhIaIR8sk3/QIWCk49kZZt9Rg5Y1NXSQGOgtzcuyBzsyZzGghl+9w8d6dhOLirq?= =?utf-8?q?XIB50CMDGeCLC+o7TPDXa18zf7A3CWP0yCGxP6Q=3D=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?8KXXOrqfg3REYj8jowJUR8UbHuZG?= =?utf-8?q?qDdJg8VUOI+xjMbKP/6tZYk1XJ981gpdIwRTwu6zqJsMlZCQ/mWvNADdyRjT+Z1Pl?= =?utf-8?q?2+f3bPxDFnQUi9geIH9wYtvmoYQ/TQ5Q4dqm85cIp1ecvfxWpUvniGYf5Ti9LjxjH?= =?utf-8?q?c9wQGvIE1e+A91uGICcm7mE1Ell6zdmiq62Ybji3dW6RByjxNUCmwwCF3fQ/9aQup?= =?utf-8?q?PK+eo2wUkLFaFuKOhf0EVavUJ9FBE1ypHSrawg5mWUhHuLIrYK5OczqMBX0egLCgb?= =?utf-8?q?xBSvLp7+a1U9kl8yhFxhLgR8pZvLPCLjp9qAxawZxhfmpjhHmQqE2sJAKMe4u7/vl?= =?utf-8?q?XpvWhu26Y4+wS1Rv94xRElLmKagxUT03YvbU62OgWVKK83oqF8OJ789mpO9VyWpWj?= =?utf-8?q?cYDkr9xVauHsDuqJtaLh0YIIIAN7JQfvxV/nZQdbnIDjs9ZVcc/j9hbHs6CvjC3cc?= =?utf-8?q?GjfSeTSRaeul6gv8J/C5FD6SQjtjLn+1GXocX3yWhsi7tkdbT03bECml/jQLOWkur?= =?utf-8?q?D/tfr5zMvv3M4+hsm3WH5ltRV8Kcy06b5tMLXTOMpawJs9dTKu8qoulUfrEL37NHw?= =?utf-8?q?w49RgKLljFSpjcnW+JBHOUWeZy+vIijAOn6ZdKfX9G35xsLMOcruRTQHfH7oTcwim?= =?utf-8?q?OQ+9mV/DeJ9EAie2pvs+VHnykJAmHDm8QyXk81QiyRsNPC9ND0c2n0Eq2APVL+SIU?= =?utf-8?q?PfXMa/jiBlaoEOzTZgqN2YyQjWXTsMEhgIwqacam0XynXE0RVeCaTkmgofQEfvCJE?= =?utf-8?q?tQp+dXvzR8RF2Bs9bTPT9FtEu/kYyjyqid4S26Qq/njcq95PFbVQZSeoPOrvLoN0w?= =?utf-8?q?dbhmeBU1YnrdWpXVIJMmk4peyS3PrrhcKNWta7oF/9TaLCJK4eK6jZlaQ/g2k03Tc?= =?utf-8?q?7qz6vgf7betLsdQpGBdRszcF+xPQd9ctjFnHbOOZMQrmkIKg3ePYtPMoRD02uLB2H?= =?utf-8?q?lmN8xFvfnj+fH5Md05WSTLuX6a9YBRoHTByUgFLq8s+zW7WtGIt8AgYlDUkQndmIF?= =?utf-8?q?4CFdkJzAyvcLN9rXtZy1807WSW+5I/aaJKTkC8/zNIzC4jhKPr0JgvlxciNR9yYCR?= =?utf-8?q?ln96IwYfdLOuABiJ+9UmPV+WQ3t/Io/x4N7jnhQR9v/FFa7mfwqLU6KA0rYa5j+7Y?= =?utf-8?q?Iq6bD+m53d50+L3CgoMvVKnwZu1LmlAg6QuHrW+zLbCPQdsEe13XAMBAs9L5fn6T6?= =?utf-8?q?DXiGMNxadbl3e2DrVnZyMccIn9aEJVyascdjjJLhXc2Hc+EXZhvvFotfeCr7jQXGc?= =?utf-8?q?aABqHN7L/bmAYTj+?= 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: ff5a7097-2f44-47bb-51f5-08dd4b7f9282 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Feb 2025 16:09:04.6813 (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: PN2PR01MB9297 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..2c74ac2e1 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");