diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 11:42:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-01 11:42:21 -0400 |
commit | eb7046e9bf466cebfcfbcdf640e41d9e3a80086c (patch) | |
tree | 7d998f56e306de4c1a78355f219e38b75cfe3866 /drivers/platform/x86/wmi.c | |
parent | 5b7449810ae6d652629c550d3974c8453836d229 (diff) | |
parent | 3b692c55e58d06ba9b17c66784cab5a95ba5be9b (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/wmi.c')
-rw-r--r-- | drivers/platform/x86/wmi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 04791ea5d97b..bea35be68706 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c | |||
@@ -987,19 +987,19 @@ static struct bus_type wmi_bus_type = { | |||
987 | .remove = wmi_dev_remove, | 987 | .remove = wmi_dev_remove, |
988 | }; | 988 | }; |
989 | 989 | ||
990 | static struct device_type wmi_type_event = { | 990 | static const struct device_type wmi_type_event = { |
991 | .name = "event", | 991 | .name = "event", |
992 | .groups = wmi_event_groups, | 992 | .groups = wmi_event_groups, |
993 | .release = wmi_dev_release, | 993 | .release = wmi_dev_release, |
994 | }; | 994 | }; |
995 | 995 | ||
996 | static struct device_type wmi_type_method = { | 996 | static const struct device_type wmi_type_method = { |
997 | .name = "method", | 997 | .name = "method", |
998 | .groups = wmi_method_groups, | 998 | .groups = wmi_method_groups, |
999 | .release = wmi_dev_release, | 999 | .release = wmi_dev_release, |
1000 | }; | 1000 | }; |
1001 | 1001 | ||
1002 | static struct device_type wmi_type_data = { | 1002 | static const struct device_type wmi_type_data = { |
1003 | .name = "data", | 1003 | .name = "data", |
1004 | .groups = wmi_data_groups, | 1004 | .groups = wmi_data_groups, |
1005 | .release = wmi_dev_release, | 1005 | .release = wmi_dev_release, |