aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/intel-wmi-thunderbolt.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-11-01 11:42:21 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-11-01 11:42:21 -0400
commiteb7046e9bf466cebfcfbcdf640e41d9e3a80086c (patch)
tree7d998f56e306de4c1a78355f219e38b75cfe3866 /drivers/platform/x86/intel-wmi-thunderbolt.c
parent5b7449810ae6d652629c550d3974c8453836d229 (diff)
parent3b692c55e58d06ba9b17c66784cab5a95ba5be9b (diff)
Merge tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform-drivers-x86
Pull x86 platform driver updates from Darren Hart: - Move the Dell dcdbas and dell_rbu drivers into platform/drivers/x86 as they are closely coupled with other drivers in this location. - Improve _init* usage for acerhdf and fix some usage issues with messages and module parameters. - Simplify asus-wmi by calling ACPI/WMI methods directly, eliminating workqueue overhead, eliminate double reporting of keyboard backlight. - Fix wake from USB failure on Bay Trail devices (intel_int0002_vgpio). - Notify intel_telemetry users when IPC1 device is not enabled. - Update various drivers with new laptop model IDs. - Update several intel drivers to use SPDX identifers and order headers alphabetically. * tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform-drivers-x86: (64 commits) HID: asus: only support backlight when it's not driven by WMI platform/x86: asus-wmi: export function for evaluating WMI methods platform/x86: asus-wmi: Only notify kbd LED hw_change by fn-key pressed platform/x86: wmi: declare device_type structure as constant platform/x86: ideapad: Add Y530-15ICH to no_hw_rfkill platform/x86: Add Intel AtomISP2 dummy / power-management driver platform/x86: touchscreen_dmi: Add min-x and min-y settings for various models platform/x86: touchscreen_dmi: Add info for the Onda V80 Plus v3 tablet platform/x86: touchscreen_dmi: Add info for the Trekstor Primetab T13B tablet platform/x86: intel_telemetry: Get rid of custom macro platform/x86: intel_telemetry: report debugfs failure MAINTAINERS: intel_telemetry: Update maintainers info platform/x86: Add LG Gram laptop special features driver platform/x86: asus-wmi: Simplify the keyboard brightness updating process platform/x86: touchscreen_dmi: Add info for the Trekstor Primebook C11 convertible platform/x86: mlx-platform: Properly use mlxplat_mlxcpld_msn201x_items MAINTAINERS: intel_pmc_core: Update MAINTAINERS firmware: dcdbas: include linux/io.h platform/x86: intel-wmi-thunderbolt: Add dynamic debugging platform/x86: intel-wmi-thunderbolt: Convert to use SPDX identifier ...
Diffstat (limited to 'drivers/platform/x86/intel-wmi-thunderbolt.c')
-rw-r--r--drivers/platform/x86/intel-wmi-thunderbolt.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/platform/x86/intel-wmi-thunderbolt.c b/drivers/platform/x86/intel-wmi-thunderbolt.c
index c2257bd06f18..9ded8e2af312 100644
--- a/drivers/platform/x86/intel-wmi-thunderbolt.c
+++ b/drivers/platform/x86/intel-wmi-thunderbolt.c
@@ -1,16 +1,8 @@
1// SPDX-License-Identifier: GPL-2.0
1/* 2/*
2 * WMI Thunderbolt driver 3 * WMI Thunderbolt driver
3 * 4 *
4 * Copyright (C) 2017 Dell Inc. All Rights Reserved. 5 * Copyright (C) 2017 Dell Inc. All Rights Reserved.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms of the GNU General Public License version 2 as published
8 * by the Free Software Foundation.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 */ 6 */
15 7
16#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 8#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -38,12 +30,16 @@ static ssize_t force_power_store(struct device *dev,
38 input.length = sizeof(u8); 30 input.length = sizeof(u8);
39 input.pointer = &mode; 31 input.pointer = &mode;
40 mode = hex_to_bin(buf[0]); 32 mode = hex_to_bin(buf[0]);
33 dev_dbg(dev, "force_power: storing %#x\n", mode);
41 if (mode == 0 || mode == 1) { 34 if (mode == 0 || mode == 1) {
42 status = wmi_evaluate_method(INTEL_WMI_THUNDERBOLT_GUID, 0, 1, 35 status = wmi_evaluate_method(INTEL_WMI_THUNDERBOLT_GUID, 0, 1,
43 &input, NULL); 36 &input, NULL);
44 if (ACPI_FAILURE(status)) 37 if (ACPI_FAILURE(status)) {
38 dev_dbg(dev, "force_power: failed to evaluate ACPI method\n");
45 return -ENODEV; 39 return -ENODEV;
40 }
46 } else { 41 } else {
42 dev_dbg(dev, "force_power: unsupported mode\n");
47 return -EINVAL; 43 return -EINVAL;
48 } 44 }
49 return count; 45 return count;
@@ -95,4 +91,4 @@ module_wmi_driver(intel_wmi_thunderbolt_driver);
95MODULE_ALIAS("wmi:" INTEL_WMI_THUNDERBOLT_GUID); 91MODULE_ALIAS("wmi:" INTEL_WMI_THUNDERBOLT_GUID);
96MODULE_AUTHOR("Mario Limonciello <mario.limonciello@dell.com>"); 92MODULE_AUTHOR("Mario Limonciello <mario.limonciello@dell.com>");
97MODULE_DESCRIPTION("Intel WMI Thunderbolt force power driver"); 93MODULE_DESCRIPTION("Intel WMI Thunderbolt force power driver");
98MODULE_LICENSE("GPL"); 94MODULE_LICENSE("GPL v2");