From patchwork Mon Mar 20 09:32:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 9634045 X-Patchwork-Delegate: dvhart@infradead.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EF3546020B for ; Mon, 20 Mar 2017 12:47:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3B4426530 for ; Mon, 20 Mar 2017 12:47:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D884B2780C; Mon, 20 Mar 2017 12:47:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EA2026530 for ; Mon, 20 Mar 2017 12:47:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754807AbdCTMqB (ORCPT ); Mon, 20 Mar 2017 08:46:01 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:36461 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753372AbdCTJce (ORCPT ); Mon, 20 Mar 2017 05:32:34 -0400 Received: by mail-lf0-f66.google.com with SMTP id g70so9590737lfh.3 for ; Mon, 20 Mar 2017 02:32:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=em4kBqFz8qXGO58XcdNRyms8A6n6n5mclCNR6dTkQw4=; b=luIfh9YpG4Ux31PnToGmE2lwS45A8tN2rYyQio4vvWixEAqqS/TC25GsZhI/dmWxOb y+G0cO8vIAhVLBarSfFPq6ui+fbcD5Oyzm+QDmn1ekSpN7AlYiEZBNgseTQUGXPm3GNr GKz0+V9bqJrM+VyX8y4xkbTAUONMVGnF0vuIo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=em4kBqFz8qXGO58XcdNRyms8A6n6n5mclCNR6dTkQw4=; b=qLWzdM2DChQrXefXsG3wy3bRR7HG7OUAwy6r058wQCRx80shU4AVyJloLSz6JJFq9R eNAsUuuctWUV99/5sR5JEGrfdwk5qz2mgglJ1+nQhxwNx+lscYDbIGld5PxqJ62TZUyc /lEV1d4wf2BzwZMs48nt/4irmwUpLt3qOv5kiNm0Fz8KHaHTNTkkFCHy/yobmmGyeYYZ 9tMRcegK75wQXkFCxHzGiMvKG220K4E7I7REZhiLNHl34JDVpngTArBd0+sX5DuSGS0n dAr4Ixkgwv3Ta9pmQGu4ao7Yeh21dy4nzMolphJP7UX4+ZcGIVh1z6+7Vt0G85w9IgjM IH8w== X-Gm-Message-State: AFeK/H14rcnlvrVxlQAHMwPnD4SwaPuY4ugmjeQ2CFAgB7YbdLXRyEorikdf2iNHReJ6wQ== X-Received: by 10.25.168.10 with SMTP id r10mr7197729lfe.178.1490002352471; Mon, 20 Mar 2017 02:32:32 -0700 (PDT) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id 4sm2918755ljf.33.2017.03.20.02.32.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Mar 2017 02:32:32 -0700 (PDT) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Jonathan Woithe , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] platform/x86: fujitsu-laptop: model-dependent sparse keymap overrides Date: Mon, 20 Mar 2017 10:32:23 +0100 Message-Id: <20170320093224.18541-8-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170320093224.18541-1-kernel@kempniu.pl> References: <20170320093224.18541-1-kernel@kempniu.pl> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some laptop models need to have different keycodes assigned to hotkey scancodes. Change the sparse keymap upon a DMI match, before the hotkey input device is setup. Instead of using three different callbacks in the DMI match table, simplify code by using the driver_data field of struct dmi_system_id to supply the requested keymap to a common callback. Also merge keymaps for S6410 and S6420 as they are identical. Rename fujitsu_dmi_table to fujitsu_laptop_dmi_table to emphasize it is no longer used by the backlight part of fujitsu-laptop. Adjust whitespace to make checkpatch happy. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 111 +++++++++++++++++----------------- 1 file changed, 55 insertions(+), 56 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 8f1c9c204110..1487eb2396c6 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -534,61 +534,6 @@ static struct platform_driver fujitsu_pf_driver = { } }; -static void __init dmi_check_cb_common(const struct dmi_system_id *id) -{ - pr_info("Identified laptop model '%s'\n", id->ident); -} - -static int __init dmi_check_cb_s6410(const struct dmi_system_id *id) -{ - dmi_check_cb_common(id); - fujitsu_bl->keycode1 = KEY_SCREENLOCK; /* "Lock" */ - fujitsu_bl->keycode2 = KEY_HELP; /* "Mobility Center" */ - return 1; -} - -static int __init dmi_check_cb_s6420(const struct dmi_system_id *id) -{ - dmi_check_cb_common(id); - fujitsu_bl->keycode1 = KEY_SCREENLOCK; /* "Lock" */ - fujitsu_bl->keycode2 = KEY_HELP; /* "Mobility Center" */ - return 1; -} - -static int __init dmi_check_cb_p8010(const struct dmi_system_id *id) -{ - dmi_check_cb_common(id); - fujitsu_bl->keycode1 = KEY_HELP; /* "Support" */ - fujitsu_bl->keycode3 = KEY_SWITCHVIDEOMODE; /* "Presentation" */ - fujitsu_bl->keycode4 = KEY_WWW; /* "Internet" */ - return 1; -} - -static const struct dmi_system_id fujitsu_dmi_table[] __initconst = { - { - .ident = "Fujitsu Siemens S6410", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK S6410"), - }, - .callback = dmi_check_cb_s6410}, - { - .ident = "Fujitsu Siemens S6420", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK S6420"), - }, - .callback = dmi_check_cb_s6420}, - { - .ident = "Fujitsu LifeBook P8010", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook P8010"), - }, - .callback = dmi_check_cb_p8010}, - {} -}; - /* ACPI device for LCD brightness control */ static const struct key_entry keymap_backlight[] = { @@ -766,8 +711,62 @@ static const struct key_entry keymap_default[] = { { KE_END, 0 } }; +static const struct key_entry keymap_s6400[] = { + { KE_KEY, KEY1_CODE, { KEY_SCREENLOCK } }, /* "Lock" */ + { KE_KEY, KEY2_CODE, { KEY_HELP } }, /* "Mobility Center */ + { KE_KEY, KEY3_CODE, { KEY_PROG3 } }, + { KE_KEY, KEY4_CODE, { KEY_PROG4 } }, + { KE_END, 0 } +}; + +static const struct key_entry keymap_p8010[] = { + { KE_KEY, KEY1_CODE, { KEY_HELP } }, /* "Support" */ + { KE_KEY, KEY2_CODE, { KEY_PROG2 } }, + { KE_KEY, KEY3_CODE, { KEY_SWITCHVIDEOMODE } }, /* "Presentation" */ + { KE_KEY, KEY4_CODE, { KEY_WWW } }, /* "WWW" */ + { KE_END, 0 } +}; + static const struct key_entry *keymap = keymap_default; +static int fujitsu_laptop_dmi_keymap_override(const struct dmi_system_id *id) +{ + pr_info("Identified laptop model '%s'\n", id->ident); + keymap = id->driver_data; + return 1; +} + +static const struct dmi_system_id fujitsu_laptop_dmi_table[] = { + { + .callback = fujitsu_laptop_dmi_keymap_override, + .ident = "Fujitsu Siemens S6410", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK S6410"), + }, + .driver_data = (void *)keymap_s6400 + }, + { + .callback = fujitsu_laptop_dmi_keymap_override, + .ident = "Fujitsu Siemens S6420", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK S6420"), + }, + .driver_data = (void *)keymap_s6400 + }, + { + .callback = fujitsu_laptop_dmi_keymap_override, + .ident = "Fujitsu LifeBook P8010", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook P8010"), + }, + .driver_data = (void *)keymap_p8010 + }, + {} +}; + static int acpi_fujitsu_laptop_input_setup(struct acpi_device *device) { struct fujitsu_laptop *fujitsu_laptop = acpi_driver_data(device); @@ -785,6 +784,7 @@ static int acpi_fujitsu_laptop_input_setup(struct acpi_device *device) fujitsu_laptop->input->id.bustype = BUS_HOST; fujitsu_laptop->input->id.product = 0x06; + dmi_check_system(fujitsu_laptop_dmi_table); ret = sparse_keymap_setup(fujitsu_laptop->input, keymap, NULL); if (ret) return ret; @@ -1135,7 +1135,6 @@ static int __init fujitsu_init(void) fujitsu_bl->keycode3 = KEY_PROG3; fujitsu_bl->keycode4 = KEY_PROG4; fujitsu_bl->keycode5 = KEY_RFKILL; - dmi_check_system(fujitsu_dmi_table); ret = acpi_bus_register_driver(&acpi_fujitsu_bl_driver); if (ret)