From patchwork Wed Jan 31 20:21:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 194932 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:106:209c:c626 with SMTP id mn5csp6979dyc; Wed, 31 Jan 2024 12:33:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IEMjGa6NpUEQccCM4rnWq2BRaUtCB4iA64+NDLSYU3wkU0uFlrU8aih8WJpC0lvxZzEXdW1 X-Received: by 2002:a0c:f250:0:b0:686:a164:24ba with SMTP id z16-20020a0cf250000000b00686a16424bamr361336qvl.57.1706733193123; Wed, 31 Jan 2024 12:33:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706733193; cv=pass; d=google.com; s=arc-20160816; b=IeXMkFUtuGkj0o1ndzjSPxjPD14P/8x6d1NFadOxnlf99vZWs7klHpEB5j29Dvf7gM DiVI/8EHX/eI3xai7in+kMNrPTKwaEiPYn5AXQZQa61qeZYjIGi37dTFPn5H46j/DiN4 fPN1N8PXQzWzvEgHKd90MrllcUso3klsWelSXmEpmzcKmpWbMDqkrliZ3Q34QQy8OZ6+ DqwxvxtKoRGpFksvIZX31YstYL8uMKUUj9gzmiykJaeOC6rjXvX3vcdBU97XmMHpqrwd McqYEsAiKo+nAeinfVQfojy+bXDuiU6dp2n2ePgKk9Smqpw7mh1ZNFxZ/IRq7gORYvk6 9O5Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=jgZ8ooAI0LuAyGngEqD25Uqz1AS0n+6LudQpuLM9QNw=; fh=BaR+43oWQ9CMTnBSQizSs9QFZ7L99J6/WkwaHX7mgNQ=; b=HC2RTXgne9Yz0YBh3fklckQB6iknEV5lTM4NtRvA8KKvilZf77Y3oRVMt4/ZgUvZJX OhlQWoCfAiG57bXjcKp33jN9U+LBIgVqetUHHQvLyPw5JbGtz8SjUtmXxi1V9exJL9T1 SGB0zB5jzQkFmbpBU7gaC1m+bkgBiQIwVZkjAQknF4AqItG0znHKRHQwHf5t60aYUdip R2cOVKGzIvfzQNz00HWCW8RKRDNGiup238oGn4saXE6oifD76MPuX2X6nq2V+a1HB66W 8fPArBdZDm8XCpFdRT+p7BWbIAg2+X9jVmSVqXEhKhoUKv2y1Psu5CniJ7ISyDDAw6JC Zwtg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=perches.com); spf=pass (google.com: domain of linux-kernel+bounces-47087-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47087-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCXXjXuvQkBqgCg04peC1dI59l/XuCSkO8X+4VySDXjCpw1Ay4eqo+68k799MY/uVO6M4HQKeOHLu5PYLPR5QoGHQB+f1A== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id vz2-20020a05620a494200b00783d5831645si12256031qkn.666.2024.01.31.12.33.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 12:33:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-47087-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=perches.com); spf=pass (google.com: domain of linux-kernel+bounces-47087-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47087-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id D5AA51C23535 for ; Wed, 31 Jan 2024 20:33:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9E2A137142; Wed, 31 Jan 2024 20:30:38 +0000 (UTC) Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) (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 B087835F18; Wed, 31 Jan 2024 20:30:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.40.44.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706733034; cv=none; b=Y1b4efBt27xGPKm75X9GSZrXqDJUUaEx5J4ogyrmPFR/K6pTXLuqLeLrtbDcSvYiphR+7iFTiiWVLOso5WfWcMnmwv+A0wIYXa9VnOj4MZaygdHQHQYCkAplhvZrXwVRDY8k1Z6WaKUU5xcnaTuEyJtKKJp0+6kcdyC9R193d3c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706733034; c=relaxed/simple; bh=zeDoYLvlNmLwt3KFjZo2WReGOSrqK1QKoZRblF9zXd0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gto6Ay8xPJ3AjFURsV6AkHEu5rxwezXh9UiBZShRO+Hk7yGBdwKSMBK1spzaCXkMffHwe7EUH1BiYX/d4zM+wuYZTBhZ47PlKVm5UJ6+3sIklOVdI0RonW/TWWZevg8to81eqJZeLyNlesvId9va/LqF1EaRnQjByGG4khITnBI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=perches.com; spf=pass smtp.mailfrom=perches.com; arc=none smtp.client-ip=216.40.44.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=perches.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=perches.com Received: from omf01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6F75AC04D4; Wed, 31 Jan 2024 20:22:38 +0000 (UTC) Received: from [HIDDEN] (Authenticated sender: joe@perches.com) by omf01.hostedemail.com (Postfix) with ESMTPA id C18B36000C; Wed, 31 Jan 2024 20:22:16 +0000 (UTC) From: Joe Perches To: Jiri Kosina , Benjamin Tissoires Cc: Sandeep C S , Junwan Cho , Jitender Sajwan , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] HID: samsung: Reduce code size Date: Wed, 31 Jan 2024 12:21:36 -0800 Message-ID: <78c90f4d27b8acb2a51219bb85bc2da08b0b6f04.1706732238.git.joe@perches.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Queue-Id: C18B36000C X-Stat-Signature: 835i6za113bm7k6atcnthoqenstj77ek X-Rspamd-Server: rspamout04 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Session-ID: U2FsdGVkX186VhaKV9E4mLDFBr5R/8n1hftpTOdA2fU= X-HE-Tag: 1706732536-342852 X-HE-Meta: U2FsdGVkX1/MmcPiLsxZwKfRQmC7lcgPLWp/hHKgVALygG5ad9LGe7663aV9uJuyuT/T/I04MDHG3FRCfQsxMYgKHbw/85Ge+cC7bSRjDC0tUC1ReBapOXp9u2T+S1PpiDnyN2befBidVRyKLiVpdRwKRUb6dwdKcpW4q73938XR8My5U7cHYrhQjml1jv06n+WIES2I8LwBJ6AySoxZ+9rAmoD/auDwL5Fs7JR/Y7bISVRfUOSF5eWfHx3KCn880IS2cQs9bJPDxg8RnewhCGmuFW493LnAyH8xQ/wSwcmJNQP2YTqD+B9/przj7T0NZcDw50Cv+/s= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789639464549897375 X-GMAIL-MSGID: 1789639464549897375 Remove samsung_kbd_mouse_map_key_clear macro and uses to reduce overall code size by ~8kb. $ size drivers/hid/hid-samsung.o* text data bss dec hex filename 3203 440 0 3643 e3b drivers/hid/hid-samsung.o.new 11286 448 0 11734 2dd6 drivers/hid/hid-samsung.o.old Consolidate multiple '&' uses. Create and use static const struct and for loops instead of multiple calls with hidden arguments of samsung_kbd_mouse_map_key_clear macro. Signed-off-by: Joe Perches --- drivers/hid/hid-samsung.c | 512 +++++++++++++++----------------------- 1 file changed, 202 insertions(+), 310 deletions(-) diff --git a/drivers/hid/hid-samsung.c b/drivers/hid/hid-samsung.c index 08fb25b8459af..d701dd3a914e7 100644 --- a/drivers/hid/hid-samsung.c +++ b/drivers/hid/hid-samsung.c @@ -81,8 +81,10 @@ static __u8 *samsung_irda_report_fixup(struct hid_device *hdev, __u8 *rdesc, return rdesc; } -#define samsung_kbd_mouse_map_key_clear(c) \ - hid_map_usage_clear(hi, usage, bit, max, EV_KEY, (c)) +struct key_clear_map { + unsigned use; + __u16 kb; +}; static int samsung_kbd_mouse_input_mapping(struct hid_device *hdev, struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, @@ -90,143 +92,101 @@ static int samsung_kbd_mouse_input_mapping(struct hid_device *hdev, { struct usb_interface *intf = to_usb_interface(hdev->dev.parent); unsigned short ifnum = intf->cur_altsetting->desc.bInterfaceNumber; - - if (ifnum != 1 || HID_UP_CONSUMER != (usage->hid & HID_USAGE_PAGE)) + int i; + unsigned use; + unsigned up = usage->hid & HID_USAGE_PAGE; + static const struct key_clear_map kcm[] = { + { 0x183, KEY_MEDIA }, + { 0x195, KEY_EMAIL }, + { 0x196, KEY_CALC }, + { 0x197, KEY_COMPUTER }, + { 0x22b, KEY_SEARCH }, + { 0x22c, KEY_WWW }, + { 0x22d, KEY_BACK }, + { 0x22e, KEY_FORWARD }, + { 0x22f, KEY_FAVORITES }, + { 0x230, KEY_REFRESH }, + { 0x231, KEY_STOP }, + }; + + if (ifnum != 1 || HID_UP_CONSUMER != up) return 0; + use = usage->hid & HID_USAGE; + dbg_hid("samsung wireless keyboard/mouse input mapping event [0x%x]\n", - usage->hid & HID_USAGE); - - switch (usage->hid & HID_USAGE) { - /* report 2 */ - case 0x183: - samsung_kbd_mouse_map_key_clear(KEY_MEDIA); - break; - case 0x195: - samsung_kbd_mouse_map_key_clear(KEY_EMAIL); - break; - case 0x196: - samsung_kbd_mouse_map_key_clear(KEY_CALC); - break; - case 0x197: - samsung_kbd_mouse_map_key_clear(KEY_COMPUTER); - break; - case 0x22b: - samsung_kbd_mouse_map_key_clear(KEY_SEARCH); - break; - case 0x22c: - samsung_kbd_mouse_map_key_clear(KEY_WWW); - break; - case 0x22d: - samsung_kbd_mouse_map_key_clear(KEY_BACK); - break; - case 0x22e: - samsung_kbd_mouse_map_key_clear(KEY_FORWARD); - break; - case 0x22f: - samsung_kbd_mouse_map_key_clear(KEY_FAVORITES); - break; - case 0x230: - samsung_kbd_mouse_map_key_clear(KEY_REFRESH); - break; - case 0x231: - samsung_kbd_mouse_map_key_clear(KEY_STOP); - break; - default: - return 0; + use); + + for (i = 0; i < ARRAY_SIZE(kcm); i++) { + if (use == kcm[i].use) { + hid_map_usage_clear(hi, usage, bit, max, EV_KEY, + kcm[i].kb); + return 1; + } } - return 1; + return 0; } static int samsung_kbd_input_mapping(struct hid_device *hdev, struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max) { - if (!(HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE) || - HID_UP_KEYBOARD == (usage->hid & HID_USAGE_PAGE))) + int i; + unsigned use; + unsigned up = usage->hid & HID_USAGE_PAGE; + + if (!(up == HID_UP_CONSUMER || up == HID_UP_KEYBOARD)) return 0; - dbg_hid("samsung wireless keyboard input mapping event [0x%x]\n", - usage->hid & HID_USAGE); + use = usage->hid & HID_USAGE; + + dbg_hid("samsung wireless keyboard input mapping event [0x%x]\n", use); + + if (up == HID_UP_KEYBOARD) { + static const struct key_clear_map kcm[] = { + { 0x32, KEY_BACKSLASH }, + { 0x64, KEY_102ND }, + { 0x87, KEY_RO }, + }; - if (HID_UP_KEYBOARD == (usage->hid & HID_USAGE_PAGE)) { set_bit(EV_REP, hi->input->evbit); - switch (usage->hid & HID_USAGE) { - case 0x32: - samsung_kbd_mouse_map_key_clear(KEY_BACKSLASH); - break; - case 0x64: - samsung_kbd_mouse_map_key_clear(KEY_102ND); - break; - /* Only for BR keyboard */ - case 0x87: - samsung_kbd_mouse_map_key_clear(KEY_RO); - break; - default: - return 0; + for (i = 0; i < ARRAY_SIZE(kcm); i++) { + if (use == kcm[i].use) { + hid_map_usage_clear(hi, usage, bit, max, EV_KEY, + kcm[i].kb); + return 1; + } } + return 0; } - if (HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE)) { - switch (usage->hid & HID_USAGE) { - /* report 2 */ - /* MENU */ - case 0x040: - samsung_kbd_mouse_map_key_clear(KEY_MENU); - break; - case 0x18a: - samsung_kbd_mouse_map_key_clear(KEY_MAIL); - break; - case 0x196: - samsung_kbd_mouse_map_key_clear(KEY_WWW); - break; - case 0x19e: - samsung_kbd_mouse_map_key_clear(KEY_SCREENLOCK); - break; - case 0x221: - samsung_kbd_mouse_map_key_clear(KEY_SEARCH); - break; - case 0x223: - samsung_kbd_mouse_map_key_clear(KEY_HOMEPAGE); - break; - /* Smtart Voice Key */ - case 0x300: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY13); - break; - /* RECENTAPPS */ - case 0x301: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY1); - break; - /* APPLICATION */ - case 0x302: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY2); - break; - /* Voice search */ - case 0x305: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY4); - break; - /* QPANEL on/off */ - case 0x306: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY5); - break; - /* SIP on/off */ - case 0x307: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY3); - break; - /* LANG */ - case 0x308: - samsung_kbd_mouse_map_key_clear(KEY_LANGUAGE); - break; - case 0x30a: - samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSDOWN); - break; - case 0x30b: - samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSUP); - break; - default: - return 0; + if (up == HID_UP_CONSUMER) { + static const struct key_clear_map kcm[] = { + { 0x040, KEY_MENU }, /* MENU */ + { 0x18a, KEY_MAIL }, + { 0x196, KEY_WWW }, + { 0x19e, KEY_SCREENLOCK }, + { 0x221, KEY_SEARCH }, + { 0x223, KEY_HOMEPAGE }, + { 0x300, BTN_TRIGGER_HAPPY13 }, /* Smtart Voice Key */ + { 0x301, BTN_TRIGGER_HAPPY1 }, /* RECENTAPPS */ + { 0x302, BTN_TRIGGER_HAPPY2 }, /* APPLICATION */ + { 0x305, BTN_TRIGGER_HAPPY4 }, /* Voice search */ + { 0x306, BTN_TRIGGER_HAPPY5 }, /* QPANEL on/off */ + { 0x307, BTN_TRIGGER_HAPPY3 }, /* SIP on/off */ + { 0x308, KEY_LANGUAGE }, /* LANG */ + { 0x30a, KEY_BRIGHTNESSDOWN }, + { 0x30b, KEY_BRIGHTNESSUP }, + }; + for (i = 0; i < ARRAY_SIZE(kcm); i++) { + if (use == kcm[i].use) { + hid_map_usage_clear(hi, usage, bit, max, EV_KEY, + kcm[i].kb); + return 1; + } } + return 0; } return 1; @@ -236,88 +196,62 @@ static int samsung_gamepad_input_mapping(struct hid_device *hdev, struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max) { - if (!(HID_UP_BUTTON == (usage->hid & HID_USAGE_PAGE) || - HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE))) + int i; + unsigned use; + unsigned up = usage->hid & HID_USAGE_PAGE; + + if (!(up == HID_UP_BUTTON || up == HID_UP_CONSUMER)) return 0; + use = usage->hid & HID_USAGE; + dbg_hid("samsung wireless gamepad input mapping event [0x%x], %ld, %ld, [0x%x]\n", - usage->hid & HID_USAGE, hi->input->evbit[0], hi->input->absbit[0], usage->hid & HID_USAGE_PAGE); - - if (HID_UP_BUTTON == (usage->hid & HID_USAGE_PAGE)) { - switch (usage->hid & HID_USAGE) { - case 0x01: - samsung_kbd_mouse_map_key_clear(BTN_A); - break; - case 0x02: - samsung_kbd_mouse_map_key_clear(BTN_B); - break; - case 0x03: - samsung_kbd_mouse_map_key_clear(BTN_C); - break; - case 0x04: - samsung_kbd_mouse_map_key_clear(BTN_X); - break; - case 0x05: - samsung_kbd_mouse_map_key_clear(BTN_Y); - break; - case 0x06: - samsung_kbd_mouse_map_key_clear(BTN_Z); - break; - case 0x07: - samsung_kbd_mouse_map_key_clear(BTN_TL); - break; - case 0x08: - samsung_kbd_mouse_map_key_clear(BTN_TR); - break; - case 0x09: - samsung_kbd_mouse_map_key_clear(BTN_TL2); - break; - case 0x0a: - samsung_kbd_mouse_map_key_clear(BTN_TR2); - break; - case 0x0b: - samsung_kbd_mouse_map_key_clear(BTN_SELECT); - break; - case 0x0c: - samsung_kbd_mouse_map_key_clear(BTN_START); - break; - case 0x0d: - samsung_kbd_mouse_map_key_clear(BTN_MODE); - break; - case 0x0e: - samsung_kbd_mouse_map_key_clear(BTN_THUMBL); - break; - case 0x0f: - samsung_kbd_mouse_map_key_clear(BTN_THUMBR); - break; - case 0x10: - samsung_kbd_mouse_map_key_clear(0x13f); - break; - default: - return 0; + use, hi->input->evbit[0], hi->input->absbit[0], up); + + if (up == HID_UP_BUTTON) { + static const struct key_clear_map kcm[] = { + { 0x01, BTN_A }, + { 0x02, BTN_B }, + { 0x03, BTN_C }, + { 0x04, BTN_X }, + { 0x05, BTN_Y }, + { 0x06, BTN_Z }, + { 0x07, BTN_TL }, + { 0x08, BTN_TR }, + { 0x09, BTN_TL2 }, + { 0x0a, BTN_TR2 }, + { 0x0b, BTN_SELECT }, + { 0x0c, BTN_START }, + { 0x0d, BTN_MODE }, + { 0x0e, BTN_THUMBL }, + { 0x0f, BTN_THUMBR }, + { 0x10, 0x13f }, + }; + for (i = 0; i < ARRAY_SIZE(kcm); i++) { + if (use == kcm[i].use) { + hid_map_usage_clear(hi, usage, bit, max, EV_KEY, + kcm[i].kb); + return 1; + } } + return 0; } - if (HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE)) { - switch (usage->hid & HID_USAGE) { - case 0x040: - samsung_kbd_mouse_map_key_clear(KEY_MENU); - break; - case 0x223: - samsung_kbd_mouse_map_key_clear(KEY_HOMEPAGE); - break; - case 0x224: - samsung_kbd_mouse_map_key_clear(KEY_BACK); - break; - - /* Screen Capture */ - case 0x303: - samsung_kbd_mouse_map_key_clear(KEY_SYSRQ); - break; - - default: - return 0; + if (up == HID_UP_CONSUMER) { + static const struct key_clear_map kcm[] = { + { 0x040, KEY_MENU }, + { 0x223, KEY_HOMEPAGE }, + { 0x224, KEY_BACK }, + { 0x303, KEY_SYSRQ }, /* Screen Capture */ + }; + for (i = 0; i < ARRAY_SIZE(kcm); i++) { + if (use == kcm[i].use) { + hid_map_usage_clear(hi, usage, bit, max, EV_KEY, + kcm[i].kb); + return 1; + } } + return 0; } return 1; @@ -327,22 +261,29 @@ static int samsung_actionmouse_input_mapping(struct hid_device *hdev, struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max) { + int i; + unsigned use; + unsigned up = usage->hid & HID_USAGE_PAGE; + static const struct key_clear_map kcm[] = { + { 0x301, 254 }, + }; + + use = usage->hid & HID_USAGE; dbg_hid("samsung wireless actionmouse input mapping event [0x%x], [0x%x], %ld, %ld, [0x%x]\n", - usage->hid, usage->hid & HID_USAGE, hi->input->evbit[0], hi->input->absbit[0], - usage->hid & HID_USAGE_PAGE); + use, usage->hid & HID_USAGE, hi->input->evbit[0], hi->input->absbit[0], + up); - if (((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER) && ((usage->hid & HID_USAGE_PAGE) != HID_UP_BUTTON)) + if (!(up == HID_UP_CONSUMER || up == HID_UP_BUTTON)) return 0; - switch (usage->hid & HID_USAGE) { - case 0x301: - samsung_kbd_mouse_map_key_clear(254); - break; - default: - return 0; + for (i = 0; i < ARRAY_SIZE(kcm); i++) { + if (use == kcm[i].use) { + hid_map_usage_clear(hi, usage, bit, max, EV_KEY, + kcm[i].kb); + return 1; + } } - return 1; } @@ -350,120 +291,71 @@ static int samsung_universal_kbd_input_mapping(struct hid_device *hdev, struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, unsigned long **bit, int *max) { - if (!(HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE) || - HID_UP_KEYBOARD == (usage->hid & HID_USAGE_PAGE))) + int i; + unsigned use; + unsigned up = usage->hid & HID_USAGE_PAGE; + + if (!(up == HID_UP_CONSUMER || up == HID_UP_KEYBOARD)) return 0; - dbg_hid("samsung wireless keyboard input mapping event [0x%x]\n", - usage->hid & HID_USAGE); + use = usage->hid & HID_USAGE; + + dbg_hid("samsung wireless keyboard input mapping event [0x%x]\n", use); + + if (up == HID_UP_KEYBOARD) { + static const struct key_clear_map kcm[] = { + { 0x32, KEY_BACKSLASH }, + { 0x64, KEY_102ND }, + { 0x87, KEY_RO }, /* Only for BR keyboard */ + }; - if (HID_UP_KEYBOARD == (usage->hid & HID_USAGE_PAGE)) { set_bit(EV_REP, hi->input->evbit); - switch (usage->hid & HID_USAGE) { - case 0x32: - samsung_kbd_mouse_map_key_clear(KEY_BACKSLASH); - break; - case 0x64: - samsung_kbd_mouse_map_key_clear(KEY_102ND); - break; - /* Only for BR keyboard */ - case 0x87: - samsung_kbd_mouse_map_key_clear(KEY_RO); - break; - default: - return 0; + for (i = 0; i < ARRAY_SIZE(kcm); i++) { + if (use == kcm[i].use) { + hid_map_usage_clear(hi, usage, bit, max, EV_KEY, + kcm[i].kb); + return 1; + } } + return 0; } - if (HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE)) { - switch (usage->hid & HID_USAGE) { + if (up == HID_UP_CONSUMER) { /* report 2 */ - /* MENU */ - case 0x040: - samsung_kbd_mouse_map_key_clear(KEY_MENU); - break; - case 0x18a: - samsung_kbd_mouse_map_key_clear(KEY_MAIL); - break; - case 0x196: - samsung_kbd_mouse_map_key_clear(KEY_WWW); - break; - case 0x19e: - samsung_kbd_mouse_map_key_clear(KEY_SCREENLOCK); - break; - case 0x221: - samsung_kbd_mouse_map_key_clear(KEY_SEARCH); - break; - case 0x223: - samsung_kbd_mouse_map_key_clear(KEY_HOMEPAGE); - break; - /* RECENTAPPS */ - case 0x301: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY1); - break; - /* APPLICATION */ - case 0x302: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY2); - break; - /* Voice search */ - case 0x305: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY4); - break; - /* QPANEL on/off */ - case 0x306: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY5); - break; - /* SIP on/off */ - case 0x307: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY3); - break; - /* LANG */ - case 0x308: - samsung_kbd_mouse_map_key_clear(KEY_LANGUAGE); - break; - case 0x30a: - samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSDOWN); - break; - case 0x070: - samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSDOWN); - break; - case 0x30b: - samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSUP); - break; - case 0x06f: - samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSUP); - break; - /* S-Finder */ - case 0x304: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY7); - break; - /* Screen Capture */ - case 0x303: - samsung_kbd_mouse_map_key_clear(KEY_SYSRQ); - break; - /* Multi Window */ - case 0x309: - samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY9); - break; - /* HotKey App 1 */ - case 0x071: - samsung_kbd_mouse_map_key_clear(0x2f5); - break; - /* HotKey App 2 */ - case 0x072: - samsung_kbd_mouse_map_key_clear(0x2f6); - break; - /* HotKey App 3 */ - case 0x073: - samsung_kbd_mouse_map_key_clear(0x2f7); - break; - /* Dex */ - case 0x06e: - samsung_kbd_mouse_map_key_clear(0x2bd); - break; - default: - return 0; + static const struct key_clear_map kcm[] = { + { 0x040, KEY_MENU }, /* MENU */ + { 0x18a, KEY_MAIL }, + { 0x196, KEY_WWW }, + { 0x19e, KEY_SCREENLOCK }, + { 0x221, KEY_SEARCH }, + { 0x223, KEY_HOMEPAGE }, + { 0x301, BTN_TRIGGER_HAPPY1 }, /* RECENTAPPS */ + { 0x302, BTN_TRIGGER_HAPPY2 }, /* APPLICATION */ + { 0x305, BTN_TRIGGER_HAPPY4 }, /* Voice search */ + { 0x306, BTN_TRIGGER_HAPPY5 }, /* QPANEL on/off */ + { 0x307, BTN_TRIGGER_HAPPY3 }, /* SIP on/off */ + { 0x308, KEY_LANGUAGE }, /* LANG */ + { 0x30a, KEY_BRIGHTNESSDOWN }, + { 0x070, KEY_BRIGHTNESSDOWN }, + { 0x30b, KEY_BRIGHTNESSUP }, + { 0x06f, KEY_BRIGHTNESSUP }, + { 0x304, BTN_TRIGGER_HAPPY7 }, /* S-Finder */ + { 0x303, KEY_SYSRQ }, /* Screen Capture */ + { 0x309, BTN_TRIGGER_HAPPY9 }, /* Multi Window */ + { 0x071, 0x2f5 }, /* HotKey App 1 */ + { 0x072, 0x2f6 }, /* HotKey App 2 */ + { 0x073, 0x2f7 }, /* HotKey App 3 */ + { 0x06e, 0x2bd }, /* Dex */ + }; + + for (i = 0; i < ARRAY_SIZE(kcm); i++) { + if (use == kcm[i].use) { + hid_map_usage_clear(hi, usage, bit, max, EV_KEY, + kcm[i].kb); + return 1; + } } + return 0; } return 1; From patchwork Wed Jan 31 20:21:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 194919 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:106:209c:c626 with SMTP id mn5csp1706dyc; Wed, 31 Jan 2024 12:23:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IH62Eux96ovKAgprKWrGVdmVEXjqv80xjFXuzA0qdgf2EzqP5zujCB2BwUhWLAmGe0dL9MO X-Received: by 2002:aa7:d394:0:b0:55e:d728:eaa6 with SMTP id x20-20020aa7d394000000b0055ed728eaa6mr4966611edq.19.1706732608232; Wed, 31 Jan 2024 12:23:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706732608; cv=pass; d=google.com; s=arc-20160816; b=jZvdnmpSL06nsSHvm17MV76/uvsYIr2snuWXloQjov51hlbyX5LN2mLlRz93TdXcXv TT71uCZ6I8zHHdvhgI9je3DfzVM3e2UOEWBjQKWQNlkszLhjltaRX1ge7erD7wezfjU5 2rh0d+TZ4pwEjUNvQtGsBc5qxsxGp38e01rPy1GMFkxSkgnJ3LT7pb2N0U+l3Pq7IyBW OhI0s9M+jDzf10grV7vXLPPs4GMBQybRjmocPd65tMHCMgA05dD8G4rcZQCjR+mI8Y0D +sNFaKNEyozGHkP4sBEmfcJUxGnotPmNpQSxL8dNj3wxN/EWn22ZNfGLYaVjkZaJlJTc 1jlg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=B46BFxnK3wuVynfm7QaYyePgdILTucFUjGYpsAU1kkA=; fh=z/+3cAa7IbcsETqun4OXHUBpZfk0cW0XJvzpoAuzW1M=; b=ZAbbuho+cYIMYi9LRfWerU/M170G80EdUStLd0+Q1ggHWUdeqjwtWyrAKWY1PUtrJd /Gw7LVqPCHqecwDLG9CvokxSHPp4m/9U1tLvK6IzVYSlwThD+RXsnUYvQ1XJwO7ApbQw AwmyItRurAVTyOFHMiljuwzfILDQzh4WsbKYtfH5pZmJwU1qi5b3/Q+kEiNBNYSYFT7Z jY30a3dWw7aIA7tY1nmnSS7A8Tb8pFtFDZYS+1noivp42ErikL1KG1SmcURj9PU4GgQf PyUDdntqE7S3SOMyhNS0N9BT0i9IHw1812vDngWiy00gO+QjQHbzWbG4ONNONBET/0BU i9dw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=perches.com); spf=pass (google.com: domain of linux-kernel+bounces-47061-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47061-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCVqg+DP/QBkGgqmXqG7sEh2hwllDVLnqNgIIkUwRuIatfFwfF5qAdDWtvMjpDQwxXHs1KSIFFWOnmJi+0HDMSaTT79ryg== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id c12-20020a50d64c000000b0055cc324ec7csi6209644edj.353.2024.01.31.12.23.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 12:23:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-47061-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=perches.com); spf=pass (google.com: domain of linux-kernel+bounces-47061-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-47061-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 765031F2330F for ; Wed, 31 Jan 2024 20:23:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4ED17405D8; Wed, 31 Jan 2024 20:23:03 +0000 (UTC) Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) (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 645733FE20; Wed, 31 Jan 2024 20:22:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=216.40.44.17 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706732580; cv=none; b=We9LjKuIQ8yncrYcnpmilnvKu6VCo3pKT4KoZ+Y3BTKKr8z4jEbnzTG6Yi8W8zwP0TCRxVs0kyCI8D21nsyRZTDeTcr4X1AsZTlafR6eBdksJQIHmGsPMSaiNKOITAcgDeLfjWIwzvTK5hdXbt+RrcBNhOGVCnbOWuogeq+Rju0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706732580; c=relaxed/simple; bh=kzei8YWWi1vwFBuTAKOyOGKxOcpujzjI9lYL/4wSxIU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dqBNcsHMQ7xEme2SHNmZ76lxodHlSqsBnTO+zE9Pwld8CevaJ2vaFXLotXueISFQrrY9wxyoz/OjQbIrSQ3wF/QGZeeyvXTroSJ7E+pRiClCgAzQgU4CFy0o0+muso8aKEqpjDNVElNzWNr9cq2XIDd/gUomyF4oVaxsbH9fZho= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=perches.com; spf=pass smtp.mailfrom=perches.com; arc=none smtp.client-ip=216.40.44.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=perches.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=perches.com Received: from omf01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id DE4D41A0D9C; Wed, 31 Jan 2024 20:22:56 +0000 (UTC) Received: from [HIDDEN] (Authenticated sender: joe@perches.com) by omf01.hostedemail.com (Postfix) with ESMTPA id AB4256000C; Wed, 31 Jan 2024 20:22:40 +0000 (UTC) From: Joe Perches To: Jiri Kosina , Benjamin Tissoires Cc: Sandeep C S , Junwan Cho , Jitender Sajwan , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] HID: samsung: Object size reduction and neatening Date: Wed, 31 Jan 2024 12:21:37 -0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Rspamd-Queue-Id: AB4256000C X-Stat-Signature: witbnhdefiu1taqjw7z7potc8thxnxqm X-Rspamd-Server: rspamout04 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Session-ID: U2FsdGVkX1/sGWd9AtS21nJhxuYC7ToKxHkz4KvdAAw= X-HE-Tag: 1706732560-721697 X-HE-Meta: U2FsdGVkX1/b8I9eB1qR9uZkl8WC4GRPRa7N2Fps1EcL3Es7JFYZ/dtGi/JXFdwxAItyPX+VP++rELgkiiP8WMJF7dwWqJ2lY0asEKYJ8JAUoNArtorjeBEHegFdO70DRqCSWgBKShHTTG3D66Ic+l4XgzfBDQojRBDl1nVHMrTvyF9HXmYUKNcGOqLDhRlYjCut1AopSPEhvCus6b6OZAW7o5vikaxBt2Jk+ky8QOGyNUP9Lv66QHXs7oXdnXMFhB1jEO/6cR1ne5lgIKumxnL4azIevcoQbCCmlApkWP/Vn6yXgVyxX31XO2jt6ceCyvSlpHusQf0= X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789638851166662758 X-GMAIL-MSGID: 1789638851166662758 Use a switch/case in samsung_input_mapping to reduce object size. $ size drivers/hid/hid-samsung.o* text data bss dec hex filename 2842 432 0 3274 cca drivers/hid/hid-samsung.o.new 3203 440 0 3643 e3b drivers/hid/hid-samsung.o.old Miscellaneous style neatening: o Use unsigned int instead of unsigned o Alignment to open parenthesis o Line wrapping Signed-off-by: Joe Perches --- drivers/hid/hid-samsung.c | 166 +++++++++++++++++++++----------------- 1 file changed, 94 insertions(+), 72 deletions(-) diff --git a/drivers/hid/hid-samsung.c b/drivers/hid/hid-samsung.c index d701dd3a914e7..63c18b9b8279f 100644 --- a/drivers/hid/hid-samsung.c +++ b/drivers/hid/hid-samsung.c @@ -49,31 +49,35 @@ * Report #3 has an array field with logical range 0..1 instead of 1..3. */ static inline void samsung_irda_dev_trace(struct hid_device *hdev, - unsigned int rsize) + unsigned int rsize) { hid_info(hdev, "fixing up Samsung IrDA %d byte report descriptor\n", rsize); } static __u8 *samsung_irda_report_fixup(struct hid_device *hdev, __u8 *rdesc, - unsigned int *rsize) + unsigned int *rsize) { - if (*rsize == 184 && !memcmp(&rdesc[175], "\x25\x40\x75\x30\x95\x01", 6) && - rdesc[182] == 0x40) { + if (*rsize == 184 && + !memcmp(&rdesc[175], "\x25\x40\x75\x30\x95\x01", 6) && + rdesc[182] == 0x40) { samsung_irda_dev_trace(hdev, 184); rdesc[176] = 0xff; rdesc[178] = 0x08; rdesc[180] = 0x06; rdesc[182] = 0x42; - } else if (*rsize == 203 && !memcmp(&rdesc[192], "\x15\x00\x25\x12", 4)) { + } else if (*rsize == 203 && + !memcmp(&rdesc[192], "\x15\x00\x25\x12", 4)) { samsung_irda_dev_trace(hdev, 203); rdesc[193] = 0x01; rdesc[195] = 0x0f; - } else if (*rsize == 135 && !memcmp(&rdesc[124], "\x15\x00\x25\x11", 4)) { + } else if (*rsize == 135 && + !memcmp(&rdesc[124], "\x15\x00\x25\x11", 4)) { samsung_irda_dev_trace(hdev, 135); rdesc[125] = 0x01; rdesc[127] = 0x0e; - } else if (*rsize == 171 && !memcmp(&rdesc[160], "\x15\x00\x25\x01", 4)) { + } else if (*rsize == 171 && + !memcmp(&rdesc[160], "\x15\x00\x25\x01", 4)) { samsung_irda_dev_trace(hdev, 171); rdesc[161] = 0x01; rdesc[163] = 0x03; @@ -82,19 +86,21 @@ static __u8 *samsung_irda_report_fixup(struct hid_device *hdev, __u8 *rdesc, } struct key_clear_map { - unsigned use; + unsigned int use; __u16 kb; }; static int samsung_kbd_mouse_input_mapping(struct hid_device *hdev, - struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, - unsigned long **bit, int *max) + struct hid_input *hi, + struct hid_field *field, + struct hid_usage *usage, + unsigned long **bit, int *max) { struct usb_interface *intf = to_usb_interface(hdev->dev.parent); unsigned short ifnum = intf->cur_altsetting->desc.bInterfaceNumber; int i; - unsigned use; - unsigned up = usage->hid & HID_USAGE_PAGE; + unsigned int use; + unsigned int up = usage->hid & HID_USAGE_PAGE; static const struct key_clear_map kcm[] = { { 0x183, KEY_MEDIA }, { 0x195, KEY_EMAIL }, @@ -129,12 +135,14 @@ static int samsung_kbd_mouse_input_mapping(struct hid_device *hdev, } static int samsung_kbd_input_mapping(struct hid_device *hdev, - struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, - unsigned long **bit, int *max) + struct hid_input *hi, + struct hid_field *field, + struct hid_usage *usage, + unsigned long **bit, int *max) { int i; - unsigned use; - unsigned up = usage->hid & HID_USAGE_PAGE; + unsigned int use; + unsigned int up = usage->hid & HID_USAGE_PAGE; if (!(up == HID_UP_CONSUMER || up == HID_UP_KEYBOARD)) return 0; @@ -193,12 +201,14 @@ static int samsung_kbd_input_mapping(struct hid_device *hdev, } static int samsung_gamepad_input_mapping(struct hid_device *hdev, - struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, - unsigned long **bit, int *max) + struct hid_input *hi, + struct hid_field *field, + struct hid_usage *usage, + unsigned long **bit, int *max) { int i; - unsigned use; - unsigned up = usage->hid & HID_USAGE_PAGE; + unsigned int use; + unsigned int up = usage->hid & HID_USAGE_PAGE; if (!(up == HID_UP_BUTTON || up == HID_UP_CONSUMER)) return 0; @@ -258,12 +268,14 @@ static int samsung_gamepad_input_mapping(struct hid_device *hdev, } static int samsung_actionmouse_input_mapping(struct hid_device *hdev, - struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, - unsigned long **bit, int *max) + struct hid_input *hi, + struct hid_field *field, + struct hid_usage *usage, + unsigned long **bit, int *max) { int i; - unsigned use; - unsigned up = usage->hid & HID_USAGE_PAGE; + unsigned int use; + unsigned int up = usage->hid & HID_USAGE_PAGE; static const struct key_clear_map kcm[] = { { 0x301, 254 }, }; @@ -271,7 +283,8 @@ static int samsung_actionmouse_input_mapping(struct hid_device *hdev, use = usage->hid & HID_USAGE; dbg_hid("samsung wireless actionmouse input mapping event [0x%x], [0x%x], %ld, %ld, [0x%x]\n", - use, usage->hid & HID_USAGE, hi->input->evbit[0], hi->input->absbit[0], + use, usage->hid & HID_USAGE, + hi->input->evbit[0], hi->input->absbit[0], up); if (!(up == HID_UP_CONSUMER || up == HID_UP_BUTTON)) @@ -288,12 +301,14 @@ static int samsung_actionmouse_input_mapping(struct hid_device *hdev, } static int samsung_universal_kbd_input_mapping(struct hid_device *hdev, - struct hid_input *hi, struct hid_field *field, struct hid_usage *usage, - unsigned long **bit, int *max) + struct hid_input *hi, + struct hid_field *field, + struct hid_usage *usage, + unsigned long **bit, int *max) { int i; - unsigned use; - unsigned up = usage->hid & HID_USAGE_PAGE; + unsigned int use; + unsigned int up = usage->hid & HID_USAGE_PAGE; if (!(up == HID_UP_CONSUMER || up == HID_UP_KEYBOARD)) return 0; @@ -362,43 +377,46 @@ static int samsung_universal_kbd_input_mapping(struct hid_device *hdev, } static __u8 *samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc, - unsigned int *rsize) + unsigned int *rsize) { - if (hdev->product == USB_DEVICE_ID_SAMSUNG_IR_REMOTE && hid_is_usb(hdev)) + if (hdev->product == USB_DEVICE_ID_SAMSUNG_IR_REMOTE && + hid_is_usb(hdev)) rdesc = samsung_irda_report_fixup(hdev, rdesc, rsize); return rdesc; } -static int samsung_input_mapping(struct hid_device *hdev, struct hid_input *hi, - struct hid_field *field, struct hid_usage *usage, - unsigned long **bit, int *max) +static int samsung_input_mapping(struct hid_device *hdev, + struct hid_input *hi, + struct hid_field *field, + struct hid_usage *usage, + unsigned long **bit, int *max) { - int ret = 0; - - if (hdev->product == USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE && hid_is_usb(hdev)) - ret = samsung_kbd_mouse_input_mapping(hdev, - hi, field, usage, bit, max); - else if (hdev->product == USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD) - ret = samsung_kbd_input_mapping(hdev, - hi, field, usage, bit, max); - else if (hdev->product == USB_DEVICE_ID_SAMSUNG_WIRELESS_GAMEPAD) - ret = samsung_gamepad_input_mapping(hdev, - hi, field, usage, bit, max); - else if (hdev->product == USB_DEVICE_ID_SAMSUNG_WIRELESS_ACTIONMOUSE) - ret = samsung_actionmouse_input_mapping(hdev, - hi, field, usage, bit, max); - else if (hdev->product == USB_DEVICE_ID_SAMSUNG_WIRELESS_UNIVERSAL_KBD) - ret = samsung_universal_kbd_input_mapping(hdev, - hi, field, usage, bit, max); - else if (hdev->product == USB_DEVICE_ID_SAMSUNG_WIRELESS_MULTI_HOGP_KBD) - ret = samsung_universal_kbd_input_mapping(hdev, - hi, field, usage, bit, max); - - return ret; + switch (hdev->product) { + case USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE: + if (hid_is_usb(hdev)) + return samsung_kbd_mouse_input_mapping(hdev, hi, field, + usage, bit, max); + break; + case USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD: + return samsung_kbd_input_mapping(hdev, hi, field, + usage, bit, max); + case USB_DEVICE_ID_SAMSUNG_WIRELESS_GAMEPAD: + return samsung_gamepad_input_mapping(hdev, hi, field, + usage, bit, max); + case USB_DEVICE_ID_SAMSUNG_WIRELESS_ACTIONMOUSE: + return samsung_actionmouse_input_mapping(hdev, hi, field, + usage, bit, max); + case USB_DEVICE_ID_SAMSUNG_WIRELESS_UNIVERSAL_KBD: + case USB_DEVICE_ID_SAMSUNG_WIRELESS_MULTI_HOGP_KBD: + return samsung_universal_kbd_input_mapping(hdev, hi, field, + usage, bit, max); + } + + return 0; } static int samsung_probe(struct hid_device *hdev, - const struct hid_device_id *id) + const struct hid_device_id *id) { int ret; unsigned int cmask = HID_CONNECT_DEFAULT; @@ -406,14 +424,13 @@ static int samsung_probe(struct hid_device *hdev, ret = hid_parse(hdev); if (ret) { hid_err(hdev, "parse failed\n"); - goto err_free; + return ret; } if (hdev->product == USB_DEVICE_ID_SAMSUNG_IR_REMOTE) { - if (!hid_is_usb(hdev)) { - ret = -EINVAL; - goto err_free; - } + if (!hid_is_usb(hdev)) + return -EINVAL; + if (hdev->rsize == 184) { /* disable hidinput, force hiddev */ cmask = (cmask & ~HID_CONNECT_HIDINPUT) | @@ -424,22 +441,27 @@ static int samsung_probe(struct hid_device *hdev, ret = hid_hw_start(hdev, cmask); if (ret) { hid_err(hdev, "hw start failed\n"); - goto err_free; + return ret; } return 0; -err_free: - return ret; } static const struct hid_device_id samsung_devices[] = { - { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, - { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_GAMEPAD) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_ACTIONMOUSE) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_UNIVERSAL_KBD) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_MULTI_HOGP_KBD) }, + { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, + USB_DEVICE_ID_SAMSUNG_IR_REMOTE) }, + { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, + USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, + USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, + USB_DEVICE_ID_SAMSUNG_WIRELESS_GAMEPAD) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, + USB_DEVICE_ID_SAMSUNG_WIRELESS_ACTIONMOUSE) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, + USB_DEVICE_ID_SAMSUNG_WIRELESS_UNIVERSAL_KBD) }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, + USB_DEVICE_ID_SAMSUNG_WIRELESS_MULTI_HOGP_KBD) }, { } }; MODULE_DEVICE_TABLE(hid, samsung_devices);