summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2015-06-16 16:27:43 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:10:15 +0200
commit7f3b62cf945dc3e57fbd693022a5651206ce85b0 (patch)
tree07331475af6cd6b9d5d733343c1fb03f6b886664
parenta341b8aba13c39fc76aea29fe13ea851df313bd6 (diff)
acpi-video-detect: Remove the unused acpi_video_dmi_demote_vendor() function
Remove the now unused acpi_video_dmi_demote_vendor() function, this was never a proper counter part of acpi_video_dmi_promote_vendor() since the calls to acpi_video_dmi_promote_vendor() are not counted. 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>
-rw-r--r--drivers/acpi/video_detect.c9
-rw-r--r--include/linux/acpi.h5
2 files changed, 0 insertions, 14 deletions
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
index be825802b228..bb78c9e16113 100644
--- a/drivers/acpi/video_detect.c
+++ b/drivers/acpi/video_detect.c
@@ -258,15 +258,6 @@ void acpi_video_dmi_promote_vendor(void)
}
EXPORT_SYMBOL(acpi_video_dmi_promote_vendor);
-/* To be called when a driver who previously promoted the vendor
- * interface */
-void acpi_video_dmi_demote_vendor(void)
-{
- acpi_video_caps_check();
- acpi_video_support &= ~ACPI_VIDEO_BACKLIGHT_DMI_VENDOR;
-}
-EXPORT_SYMBOL(acpi_video_dmi_demote_vendor);
-
/* Returns true if video.ko can do backlight switching */
int acpi_video_backlight_support(void)
{
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index e4da5e35e29c..01bffd30c6c7 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -248,7 +248,6 @@ extern bool wmi_has_guid(const char *guid);
extern long acpi_video_get_capabilities(acpi_handle graphics_dev_handle);
extern long acpi_is_video_device(acpi_handle handle);
extern void acpi_video_dmi_promote_vendor(void);
-extern void acpi_video_dmi_demote_vendor(void);
extern int acpi_video_backlight_support(void);
extern int acpi_video_display_switch_support(void);
@@ -268,10 +267,6 @@ static inline void acpi_video_dmi_promote_vendor(void)
{
}
-static inline void acpi_video_dmi_demote_vendor(void)
-{
-}
-
static inline int acpi_video_backlight_support(void)
{
return 0;