AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO

Browse Source 
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
Corentin Chary 2012-08-20 23:01:50 +02:00 committed by Matthew Garrett
parent e6d9d3d59c
commit 689db7843d
4 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/platform/x86/acer-wmi.c
View File

@ -2196,10 +2196,8 @@ static int __init acer_wmi_init(void)
interface->capability &= ~ACER_CAP_BRIGHTNESS; interface->capability &= ~ACER_CAP_BRIGHTNESS;
pr_info("Brightness must be controlled by acpi video driver\n"); pr_info("Brightness must be controlled by acpi video driver\n");
} else { } else {
#ifdef CONFIG_ACPI_VIDEO
pr_info("Disabling ACPI video driver\n"); pr_info("Disabling ACPI video driver\n");
acpi_video_unregister(); acpi_video_unregister();
#endif
} }
if (wmi_has_guid(WMID_GUID3)) { if (wmi_has_guid(WMID_GUID3)) {

4
drivers/platform/x86/apple-gmux.c
View File

@ -511,9 +511,7 @@ static int __devinit gmux_probe(struct pnp_dev *pnp,
* Disable the other backlight choices. * Disable the other backlight choices.
*/ */
acpi_video_dmi_promote_vendor(); acpi_video_dmi_promote_vendor();
#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE)
acpi_video_unregister(); acpi_video_unregister();
#endif
apple_bl_unregister(); apple_bl_unregister();
gmux_data->power_state = VGA_SWITCHEROO_ON; gmux_data->power_state = VGA_SWITCHEROO_ON;
@ -599,9 +597,7 @@ static void __devexit gmux_remove(struct pnp_dev *pnp)
kfree(gmux_data); kfree(gmux_data);
acpi_video_dmi_demote_vendor(); acpi_video_dmi_demote_vendor();
#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE)
acpi_video_register(); acpi_video_register();
#endif
apple_bl_register(); apple_bl_register();
} }

4
drivers/platform/x86/asus-wmi.c
View File

@ -47,9 +47,7 @@
#include <linux/thermal.h> #include <linux/thermal.h>
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#ifdef CONFIG_ACPI_VIDEO
#include <acpi/video.h> #include <acpi/video.h>
#endif
#include "asus-wmi.h" #include "asus-wmi.h"
@ -1704,10 +1702,8 @@ static int asus_wmi_add(struct platform_device *pdev)
if (asus->driver->quirks->wmi_backlight_power) if (asus->driver->quirks->wmi_backlight_power)
acpi_video_dmi_promote_vendor(); acpi_video_dmi_promote_vendor();
if (!acpi_video_backlight_support()) { if (!acpi_video_backlight_support()) {
#ifdef CONFIG_ACPI_VIDEO
pr_info("Disabling ACPI video driver\n"); pr_info("Disabling ACPI video driver\n");
acpi_video_unregister(); acpi_video_unregister();
#endif
err = asus_wmi_backlight_init(asus); err = asus_wmi_backlight_init(asus);
if (err && err != -ENODEV) if (err && err != -ENODEV)
goto fail_backlight; goto fail_backlight;

4
drivers/platform/x86/samsung-laptop.c
View File

@ -26,9 +26,7 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#ifdef CONFIG_ACPI_VIDEO
#include <acpi/video.h> #include <acpi/video.h>
#endif
/* /*
* This driver is needed because a number of Samsung laptops do not hook * This driver is needed because a number of Samsung laptops do not hook
@ -1558,9 +1556,7 @@ static int __init samsung_init(void)
samsung->handle_backlight = false; samsung->handle_backlight = false;
} else if (samsung->quirks->broken_acpi_video) { } else if (samsung->quirks->broken_acpi_video) {
pr_info("Disabling ACPI video driver\n"); pr_info("Disabling ACPI video driver\n");
#ifdef CONFIG_ACPI_VIDEO
acpi_video_unregister(); acpi_video_unregister();
#endif
} }
#endif #endif