Re: [PATCH 2/7] drivers-platform-x86: use acpi_video_dmi_promote_vendor()

[Corentin Chary]

On Thu, Jun 14, 2012 at 11:58 AM, joeyli <jlee@xxxxxxxx> wrote:
> Hi Corentin,
>
> æ äï2012-06-13 æ 09:32 +0200ïCorentin Chary æåï
>> 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@xxxxxxxxx>
>> ---
>> Âdrivers/platform/x86/acer-wmi.c    |  16 +++++++++-------
>> Âdrivers/platform/x86/apple-gmux.c   |  Â6 ++++++
>> Âdrivers/platform/x86/samsung-laptop.c | Â 22 ++++++++++++----------
>> Â3 files changed, 27 insertions(+), 17 deletions(-)
>>
>> diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
>> index ce875dc..ffc53df 100644
>> --- a/drivers/platform/x86/acer-wmi.c
>> +++ b/drivers/platform/x86/acer-wmi.c
>> @@ -2060,14 +2060,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
>
> The 'ifdef CONFIG_ACPI_VIDEO' didn't work on my machine with v3.4
> kernel, the acpi video didn't unregister.
>
> My autoconf.h like following:
>
> include/generated/autoconf.h:#define CONFIG_ACPI_VIDEO_MODULE 1
>
>
> Need use:
>
> -#ifdef CONFIG_ACPI_VIDEO
> +#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE)
> Â Â Â Âpr_info("Disabling ACPI video driver\n");
> Â Â Â Âacpi_video_unregister();
> #endif
>
> I tested the above change works to me.

I checked include/acpi/video.h and I could in fact remove all #ifdef stuff...
Thanks ! Will update the patches.


-- 
Corentin Chary
http://xf.iksaif.net
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/