| Message ID | 1345496512-11780-2-git-send-email-corentin.chary@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
? ??2012-08-20 ? 23:01 +0200?Corentin Chary ??? > Signed-off-by: Corentin Chary <corentin.chary@gmail.com> > --- > drivers/platform/x86/acer-wmi.c | 2 -- > drivers/platform/x86/apple-gmux.c | 4 ---- > drivers/platform/x86/asus-wmi.c | 4 ---- > drivers/platform/x86/samsung-laptop.c | 4 ---- > 4 files changed, 14 deletions(-) > > diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c > index 3782e1c..934d861 100644 > --- a/drivers/platform/x86/acer-wmi.c > +++ b/drivers/platform/x86/acer-wmi.c > @@ -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 > } > Yes, we need this patch otherwise the acpi/video will not unregister if acpi/video build to module. It will cause regression on v3.6 kernel for some machines backlight control need use 'acpi_backlight=vendor'. Acked-by: Lee, Chun-Yi <jlee@suse.com> Thanks a lot! Joey Lee > if (wmi_has_guid(WMID_GUID3)) { > diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c > index dfb1a92..dca31ce 100644 > --- a/drivers/platform/x86/apple-gmux.c > +++ b/drivers/platform/x86/apple-gmux.c > @@ -505,9 +505,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; > @@ -593,9 +591,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(); > } > > diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c > index 6a91a0c..912ec7d 100644 > --- a/drivers/platform/x86/asus-wmi.c > +++ b/drivers/platform/x86/asus-wmi.c > @@ -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" > > @@ -1780,10 +1778,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; > diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c > index c1ca7bc..dd90d15 100644 > --- a/drivers/platform/x86/samsung-laptop.c > +++ b/drivers/platform/x86/samsung-laptop.c > @@ -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 > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Aug 20, 2012 at 10:01 PM, Corentin Chary <corentin.chary@gmail.com> wrote: > Signed-off-by: Corentin Chary <corentin.chary@gmail.com> > --- > drivers/platform/x86/acer-wmi.c | 2 -- > drivers/platform/x86/apple-gmux.c | 4 ---- > drivers/platform/x86/asus-wmi.c | 4 ---- > drivers/platform/x86/samsung-laptop.c | 4 ---- > 4 files changed, 14 deletions(-) > > diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c > index 3782e1c..934d861 100644 > --- a/drivers/platform/x86/acer-wmi.c > +++ b/drivers/platform/x86/acer-wmi.c > @@ -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)) { > diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c > index dfb1a92..dca31ce 100644 > --- a/drivers/platform/x86/apple-gmux.c > +++ b/drivers/platform/x86/apple-gmux.c > @@ -505,9 +505,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; > @@ -593,9 +591,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(); > } > > diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c > index 6a91a0c..912ec7d 100644 > --- a/drivers/platform/x86/asus-wmi.c > +++ b/drivers/platform/x86/asus-wmi.c > @@ -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" > > @@ -1780,10 +1778,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; > diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c > index c1ca7bc..dd90d15 100644 > --- a/drivers/platform/x86/samsung-laptop.c > +++ b/drivers/platform/x86/samsung-laptop.c > @@ -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 > > -- > 1.7.9.5 > Any news on that ? This should really be merged before the end of rcs. Thanks,
Sorry, yes, I'll be merging these this week.
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index 3782e1c..934d861 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -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)) { diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c index dfb1a92..dca31ce 100644 --- a/drivers/platform/x86/apple-gmux.c +++ b/drivers/platform/x86/apple-gmux.c @@ -505,9 +505,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; @@ -593,9 +591,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(); } diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 6a91a0c..912ec7d 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -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" @@ -1780,10 +1778,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; diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c index c1ca7bc..dd90d15 100644 --- a/drivers/platform/x86/samsung-laptop.c +++ b/drivers/platform/x86/samsung-laptop.c @@ -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
Signed-off-by: Corentin Chary <corentin.chary@gmail.com> --- drivers/platform/x86/acer-wmi.c | 2 -- drivers/platform/x86/apple-gmux.c | 4 ---- drivers/platform/x86/asus-wmi.c | 4 ---- drivers/platform/x86/samsung-laptop.c | 4 ---- 4 files changed, 14 deletions(-)