From 7885f2f94489d566559274891cc1400cbc059b10 Mon Sep 17 00:00:00 2001 From: Souvik Kumar Chakravarty Date: Wed, 20 Jan 2016 12:20:46 +0530 Subject: intel_telemetry_debugfs: Fix unused warnings in telemetry debugfs This patch fixes compile time warnings when CONFIG_PM_SLEEP is undefined. In this case sleep related counters are unused. Signed-off-by: Souvik Kumar Chakravarty Signed-off-by: Darren Hart --- drivers/platform/x86/intel_telemetry_debugfs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/platform/x86/intel_telemetry_debugfs.c b/drivers/platform/x86/intel_telemetry_debugfs.c index 5b31d1548c07..f5134acd6ff0 100644 --- a/drivers/platform/x86/intel_telemetry_debugfs.c +++ b/drivers/platform/x86/intel_telemetry_debugfs.c @@ -96,9 +96,11 @@ } \ } +#ifdef CONFIG_PM_SLEEP static u8 suspend_prep_ok; static u32 suspend_shlw_ctr_temp, suspend_deep_ctr_temp; static u64 suspend_shlw_res_temp, suspend_deep_res_temp; +#endif struct telemetry_susp_stats { u32 shlw_swake_ctr; -- cgit v1.2.3 From f1fc3cd8984d9e6bd77c342be1aba1c883de16d8 Mon Sep 17 00:00:00 2001 From: Souvik Kumar Chakravarty Date: Thu, 21 Jan 2016 09:30:50 +0530 Subject: MAINTAINERS: Combine multiple telemetry entries This patch combines all the telemetry file entries in MAINTAINERS via wildcard. Signed-off-by: Souvik Kumar Chakravarty Signed-off-by: Darren Hart --- MAINTAINERS | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 45d2717760fc..4ad9d7c46cac 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5781,10 +5781,8 @@ INTEL TELEMETRY DRIVER M: Souvik Kumar Chakravarty L: platform-driver-x86@vger.kernel.org S: Maintained -F: drivers/platform/x86/intel_telemetry_core.c F: arch/x86/include/asm/intel_telemetry.h -F: drivers/platform/x86/intel_telemetry_pltdrv.c -F: drivers/platform/x86/intel_telemetry_debugfs.c +F: drivers/platform/x86/intel_telemetry* IOC3 ETHERNET DRIVER M: Ralf Baechle -- cgit v1.2.3 From 6b31de3e698582fe0b8f7f4bab15831b73204800 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Sun, 24 Jan 2016 10:46:42 -0500 Subject: ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list Like the Yoga 900 models the Lenovo Yoga 700 does not have a hw rfkill switch, and trying to read the hw rfkill switch through the ideapad module causes it to always reported blocking breaking wifi. This commit adds the Lenovo Yoga 700 to the no_hw_rfkill dmi list, fixing the wifi breakage. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1295272 Tested-by: Cc: stable@vger.kernel.org Signed-off-by: Josh Boyer Signed-off-by: Darren Hart --- drivers/platform/x86/ideapad-laptop.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/ideapad-laptop.c index d28db0e793df..d78ee151c9e4 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -899,6 +899,13 @@ static const struct dmi_system_id no_hw_rfkill_list[] = { DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 3"), }, }, + { + .ident = "Lenovo Yoga 700", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo YOGA 700"), + }, + }, { .ident = "Lenovo Yoga 900", .matches = { -- cgit v1.2.3