Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756145Ab2FNM6u (ORCPT ); Thu, 14 Jun 2012 08:58:50 -0400 Received: from nat.nue.novell.com ([195.135.221.2]:55252 "EHLO nat.nue.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755930Ab2FNM6q (ORCPT ); Thu, 14 Jun 2012 08:58:46 -0400 Subject: Re: [PATCH 2/7] drivers-platform-x86: use acpi_video_dmi_promote_vendor() From: joeyli To: Corentin Chary Cc: Len Brown , Matthew Garrett , linux-acpi@vger.kernel.org, platform-driver-x86@vger.kernel.org, Joey Lee , Matthew Garrett , Corentin Chary , linux-kernel@vger.kernel.org In-Reply-To: <1339671870-27624-1-git-send-email-corentin.chary@gmail.com> References: <1339671870-27624-1-git-send-email-corentin.chary@gmail.com> Content-Type: text/plain; charset="UTF-8" Date: Thu, 14 Jun 2012 20:53:51 +0800 Message-ID: <1339678431.9598.99.camel@linux-s257.site> Mime-Version: 1.0 X-Mailer: Evolution 2.28.2 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4150 Lines: 122 於 四，2012-06-14 於 13:04 +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 It's good to me! Acked-by: Lee, Chun-Yi Thanks a lot! Joey Lee > --- > drivers/platform/x86/acer-wmi.c | 14 +++++++------- > drivers/platform/x86/apple-gmux.c | 2 ++ > drivers/platform/x86/samsung-laptop.c | 20 +++++++++----------- > 3 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c > index ce875dc..7057aef 100644 > --- a/drivers/platform/x86/acer-wmi.c > +++ b/drivers/platform/x86/acer-wmi.c > @@ -2060,14 +2060,14 @@ 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 { > + pr_info("Disabling ACPI video driver\n"); > + acpi_video_unregister(); > } > > if (wmi_has_guid(WMID_GUID3)) { > diff --git a/drivers/platform/x86/apple-gmux.c b/drivers/platform/x86/apple-gmux.c > index 694a15a..fd61502 100644 > --- a/drivers/platform/x86/apple-gmux.c > +++ b/drivers/platform/x86/apple-gmux.c > @@ -193,6 +193,7 @@ 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(); > acpi_video_unregister(); > apple_bl_unregister(); > > @@ -213,6 +214,7 @@ 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(); > acpi_video_register(); > apple_bl_register(); > } > diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c > index e2a34b4..b822784 100644 > --- a/drivers/platform/x86/samsung-laptop.c > +++ b/drivers/platform/x86/samsung-laptop.c > @@ -26,9 +26,7 @@ > #include > #include > #include > -#if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE) > #include > -#endif > > /* > * This driver is needed because a number of Samsung laptops do not hook > @@ -1530,15 +1528,16 @@ 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"); > + acpi_video_unregister(); > } > #endif > > @@ -1552,8 +1551,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 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/