leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

acpi-video-detect: Move acpi_osi_is_win8 to osl.c

Browse Source 
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@redhat.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Hans de Goede 2015-06-16 16:27:46 +02:00 committed by Rafael J. Wysocki
parent adc8bb8e0f
commit a87878bafa
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/acpi/internal.h
View File

@ -181,13 +181,6 @@ static inline int suspend_nvs_save(void) { return 0; }
static inline void suspend_nvs_restore(void) {} static inline void suspend_nvs_restore(void) {}
#endif #endif
/*--------------------------------------------------------------------------
Video
-------------------------------------------------------------------------- */
#if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE)
bool acpi_osi_is_win8(void);
#endif
/*-------------------------------------------------------------------------- /*--------------------------------------------------------------------------
Device properties Device properties
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */

6
drivers/acpi/osl.c
View File

@ -1684,6 +1684,12 @@ int acpi_resources_are_enforced(void)
} }
EXPORT_SYMBOL(acpi_resources_are_enforced); 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. * Deallocate the memory for a spinlock.
*/ */

6
drivers/acpi/video_detect.c
View File

@ -178,12 +178,6 @@ static void acpi_video_caps_check(void)
acpi_video_get_capabilities(NULL); 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. /* Promote the vendor interface instead of the generic video module.
* This function allow DMI blacklists to be implemented by externals * This function allow DMI blacklists to be implemented by externals
* platform drivers instead of putting a big blacklist in video_detect.c * platform drivers instead of putting a big blacklist in video_detect.c

1
include/linux/acpi.h
View File

@ -266,6 +266,7 @@ static inline int acpi_video_backlight_support(void)
extern int acpi_blacklisted(void); extern int acpi_blacklisted(void);
extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d); extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
extern void acpi_osi_setup(char *str); extern void acpi_osi_setup(char *str);
extern bool acpi_osi_is_win8(void);
#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_ACPI_NUMA
int acpi_get_node(acpi_handle handle); int acpi_get_node(acpi_handle handle);