Re: [PATCH v3 08/35] acpi-video-detect: Move acpi_osi_is_win8 to osl.c

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello,

I have a Thinkpad Helix, on which I've installed Ubuntu, in different versions, at different times.

When I resume from a standby operation, the dock led flashes. If I detach the screen and attach it again, the led stops flashing.

The syslog shows multiple instances of this error when the led flashes:

  Jun 14 17:29:07 amiga kernel: [ 9428.704280] thinkpad_acpi: unknown possible thermal alarm or keyboard event received
  Jun 14 17:29:07 amiga kernel: [ 9428.704291] thinkpad_acpi: unhandled HKEY event 0x60b0
  Jun 14 17:29:07 amiga kernel: [ 9428.704296] thinkpad_acpi: please report the conditions when this event happened to ibm-acpi-devel@xxxxxxxxxxxxxxxxxxxxx

Is there anything I can do (aside ignoring and detaching/attaching)?

Thanks.

On 16 June 2015 at 16:27, Hans de Goede <hdegoede@xxxxxxxxxx> wrote:
acpi_osi_is_win8 needs access to acpi_gbl_osi_data which is not exported,
so move it to osl.c. Alternatively we could export acpi_gbl_osi_data but
that seems undesirable.

This allows video_detect.c to be build as a module, besides that
acpi_osi_is_win8() is something which does not really belong in
video_detect.c in the first place.

Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
---
 drivers/acpi/internal.h     | 7 -------
 drivers/acpi/osl.c          | 6 ++++++
 drivers/acpi/video_detect.c | 6 ------
 include/linux/acpi.h        | 1 +
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index ae919b5..787c629 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -184,13 +184,6 @@ static inline void suspend_nvs_restore(void) {}
 #endif

 /*--------------------------------------------------------------------------
-                                       Video
-  -------------------------------------------------------------------------- */
-#if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE)
-bool acpi_osi_is_win8(void);
-#endif
-
-/*--------------------------------------------------------------------------
                                Device properties
   -------------------------------------------------------------------------- */
 #define ACPI_DT_NAMESPACE_HID  "PRP0001"
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index a3acd84..a5dc903 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1680,6 +1680,12 @@ int acpi_resources_are_enforced(void)
 }
 EXPORT_SYMBOL(acpi_resources_are_enforced);

+bool acpi_osi_is_win8(void)
+{
+       return acpi_gbl_osi_data >= ACPI_OSI_WIN_8;
+}
+EXPORT_SYMBOL(acpi_osi_is_win8);
+
 /*
  * Deallocate the memory for a spinlock.
  */
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index 5076138..b2270ca 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -178,12 +178,6 @@ static void acpi_video_caps_check(void)
                acpi_video_get_capabilities(NULL);
 }

-bool acpi_osi_is_win8(void)
-{
-       return acpi_gbl_osi_data >= ACPI_OSI_WIN_8;
-}
-EXPORT_SYMBOL(acpi_osi_is_win8);
-
 /* Promote the vendor interface instead of the generic video module.
  * This function allow DMI blacklists to be implemented by externals
  * platform drivers instead of putting a big blacklist in video_detect.c
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 88228df..798c8d0 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -276,6 +276,7 @@ static inline int acpi_video_backlight_support(void)
 extern int acpi_blacklisted(void);
 extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
 extern void acpi_osi_setup(char *str);
+extern bool acpi_osi_is_win8(void);

 #ifdef CONFIG_ACPI_NUMA
 int acpi_get_node(acpi_handle handle);
--
2.3.6


------------------------------------------------------------------------------
_______________________________________________
ibm-acpi-devel mailing list
ibm-acpi-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel

------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
ibm-acpi-devel mailing list
ibm-acpi-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel

[Index of Archives]     [Linux ACPI]     [Linux Kernel]     [Linux Laptop]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Photo]     [Yosemite Photos]     [Yosemite Advice]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Device Mapper]

  Powered by Linux