Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 689db784 authored by Corentin Chary's avatar Corentin Chary Committed by Matthew Garrett
Browse files

drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO 



Signed-off-by: default avatarCorentin Chary <corentin.chary@gmail.com>
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
parent e6d9d3d5

drivers/platform/x86/acer-wmi.c

+0 −2
Original line number Diff line number Diff line
@@ -2196,10 +2196,8 @@ static int __init acer_wmi_init(void) 
		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)) {

drivers/platform/x86/apple-gmux.c

+0 −4
Original line number Diff line number Diff line
@@ -511,9 +511,7 @@ static int __devinit gmux_probe(struct pnp_dev *pnp, 
	 * Disable the other backlight choices.

	 */

	acpi_video_dmi_promote_vendor();

#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE)

	acpi_video_unregister();

#endif

	apple_bl_unregister();



	gmux_data->power_state = VGA_SWITCHEROO_ON;
@@ -599,9 +597,7 @@ static void __devexit gmux_remove(struct pnp_dev *pnp) 
	kfree(gmux_data);



	acpi_video_dmi_demote_vendor();

#if defined (CONFIG_ACPI_VIDEO) || defined (CONFIG_ACPI_VIDEO_MODULE)

	acpi_video_register();

#endif

	apple_bl_register();

}

drivers/platform/x86/asus-wmi.c

+0 −4
Original line number Diff line number Diff line
@@ -47,9 +47,7 @@ 
#include <linux/thermal.h>

#include <acpi/acpi_bus.h>

#include <acpi/acpi_drivers.h>

#ifdef CONFIG_ACPI_VIDEO

#include <acpi/video.h>

#endif



#include "asus-wmi.h"
@@ -1704,10 +1702,8 @@ static int asus_wmi_add(struct platform_device *pdev) 
	if (asus->driver->quirks->wmi_backlight_power)

		acpi_video_dmi_promote_vendor();

	if (!acpi_video_backlight_support()) {

#ifdef CONFIG_ACPI_VIDEO

		pr_info("Disabling ACPI video driver\n");

		acpi_video_unregister();

#endif

		err = asus_wmi_backlight_init(asus);

		if (err && err != -ENODEV)

			goto fail_backlight;

drivers/platform/x86/samsung-laptop.c

+0 −4
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ 
#include <linux/seq_file.h>

#include <linux/debugfs.h>

#include <linux/ctype.h>

#ifdef CONFIG_ACPI_VIDEO

#include <acpi/video.h>

#endif



/*

 * 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;

	} else if (samsung->quirks->broken_acpi_video) {

		pr_info("Disabling ACPI video driver\n");

#ifdef CONFIG_ACPI_VIDEO

		acpi_video_unregister();

#endif

	}

#endif