drivers-platform-x86: use acpi_video_dmi_promote_vendor()

Instead of using directly acpi_video_unregister(), use
acpi_video_dmi_promote_vendor() (and make it call
acpi_video_unregister() if needed)

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>

diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 175809dd5587b41ce72d1ee9d358f85df147f0a4..377d92d8d9b18342912dfbabc75775c9c2ad49c4 100644 (file)
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -2191,14 +2191,16 @@ static int __init acer_wmi_init(void)
 
        set_quirks();
 
+       if (dmi_check_system(video_vendor_dmi_table))
+               acpi_video_dmi_promote_vendor();
        if (acpi_video_backlight_support()) {
-               if (dmi_check_system(video_vendor_dmi_table)) {
-                       acpi_video_unregister();
-               } else {
-                       interface->capability &= ~ACER_CAP_BRIGHTNESS;
-                       pr_info("Brightness must be controlled by "
-                               "acpi video driver\n");
-               }
+               interface->capability &= ~ACER_CAP_BRIGHTNESS;
+               pr_info("Brightness must be controlled by acpi video driver\n");
+       } else {
+#ifdef CONFIG_ACPI_VIDEO
+               pr_info("Disabling ACPI video driver\n");
+               acpi_video_unregister();
+#endif
        }
 
        if (wmi_has_guid(WMID_GUID3)) {

diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c
index 694a15a56230668c4eee12c7f5e7bc421a09cb0a..905fa01ac8df7abe86893964fd50c15a96b3b5d6 100644 (file)
--- a/drivers/platform/x86/apple-gmux.c
+++ b/drivers/platform/x86/apple-gmux.c
@@ -193,7 +193,10 @@ static int __devinit gmux_probe(struct pnp_dev *pnp,
         * backlight control and supports more levels than other options.
         * Disable the other backlight choices.
         */
+       acpi_video_dmi_promote_vendor();
+#ifdef CONFIG_ACPI_VIDEO
        acpi_video_unregister();
+#endif
        apple_bl_unregister();
 
        return 0;
@@ -213,7 +216,10 @@ static void __devexit gmux_remove(struct pnp_dev *pnp)
        release_region(gmux_data->iostart, gmux_data->iolen);
        kfree(gmux_data);
 
+       acpi_video_dmi_demote_vendor();
+#ifdef CONFIG_ACPI_VIDEO
        acpi_video_register();
+#endif
        apple_bl_register();
 }
 

diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
index e2a34b42ddc1d584b5333fe9921d0d2c2b12dda4..2cbccc1b4b689c5886af67d59eb960120399cf88 100644 (file)
--- a/drivers/platform/x86/samsung-laptop.c
+++ b/drivers/platform/x86/samsung-laptop.c
@@ -26,7 +26,7 @@
 #include <linux/seq_file.h>
 #include <linux/debugfs.h>
 #include <linux/ctype.h>
-#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)
+#ifdef CONFIG_ACPI_VIDEO
 #include <acpi/video.h>
 #endif
 
@@ -1530,15 +1530,18 @@ static int __init samsung_init(void)
        samsung->quirks = quirks;
 
 
-#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)
+#ifdef CONFIG_ACPI
+       if (samsung->quirks->broken_acpi_video)
+               acpi_video_dmi_promote_vendor();
+
        /* Don't handle backlight here if the acpi video already handle it */
        if (acpi_video_backlight_support()) {
-               if (samsung->quirks->broken_acpi_video) {
-                       pr_info("Disabling ACPI video driver\n");
-                       acpi_video_unregister();
-               } else {
-                       samsung->handle_backlight = false;
-               }
+               samsung->handle_backlight = false;
+       } else if (samsung->quirks->broken_acpi_video) {
+               pr_info("Disabling ACPI video driver\n");
+#ifdef CONFIG_ACPI_VIDEO
+               acpi_video_unregister();
+#endif
        }
 #endif
 
@@ -1552,8 +1555,7 @@ static int __init samsung_init(void)
 
 #ifdef CONFIG_ACPI
        /* Only log that if we are really on a sabi platform */
-       if (acpi_video_backlight_support() &&
-           !samsung->quirks->broken_acpi_video)
+       if (acpi_video_backlight_support())
                pr_info("Backlight controlled by ACPI video driver\n");
 #endif