* [PATCH 1/3] drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO
[not found] <1345496512-11780-1-git-send-email-corentin.chary@gmail.com>
@ 2012-08-20 21:01 ` Corentin Chary
2012-08-21 7:46 ` joeyli
2012-09-07 20:37 ` Corentin Chary
2012-08-20 21:01 ` [PATCH 2/3] asus-laptop: HRWS/HWRS typo Corentin Chary
2012-08-20 21:01 ` [PATCH 3/3] platform/x86: fix asus_laptop.wled_type description Corentin Chary
2 siblings, 2 replies; 7+ messages in thread
From: Corentin Chary @ 2012-08-20 21:01 UTC (permalink / raw)
To: Matthew Garrett
Cc: linux-acpi, platform-driver-x86, Corentin Chary, Joey Lee,
Matthew Garrett, linux-kernel, acpi4asus-user
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
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO
2012-08-20 21:01 ` [PATCH 1/3] drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO Corentin Chary
@ 2012-08-21 7:46 ` joeyli
2012-09-07 20:37 ` Corentin Chary
1 sibling, 0 replies; 7+ messages in thread
From: joeyli @ 2012-08-21 7:46 UTC (permalink / raw)
To: Corentin Chary
Cc: Matthew Garrett, linux-acpi, platform-driver-x86, Joey Lee,
Matthew Garrett, linux-kernel, acpi4asus-user
於 一，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
>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO
2012-08-20 21:01 ` [PATCH 1/3] drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO Corentin Chary
2012-08-21 7:46 ` joeyli
@ 2012-09-07 20:37 ` Corentin Chary
2012-09-07 20:44 ` Matthew Garrett
1 sibling, 1 reply; 7+ messages in thread
From: Corentin Chary @ 2012-09-07 20:37 UTC (permalink / raw)
To: Matthew Garrett
Cc: linux-acpi, platform-driver-x86, Corentin Chary, Joey Lee,
Matthew Garrett, linux-kernel, acpi4asus-user
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,
--
Corentin Chary
http://xf.iksaif.net
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] asus-laptop: HRWS/HWRS typo
[not found] <1345496512-11780-1-git-send-email-corentin.chary@gmail.com>
2012-08-20 21:01 ` [PATCH 1/3] drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO Corentin Chary
@ 2012-08-20 21:01 ` Corentin Chary
2012-08-20 21:11 ` Alan Cox
2012-08-20 21:01 ` [PATCH 3/3] platform/x86: fix asus_laptop.wled_type description Corentin Chary
2 siblings, 1 reply; 7+ messages in thread
From: Corentin Chary @ 2012-08-20 21:01 UTC (permalink / raw)
To: Matthew Garrett
Cc: linux-acpi, platform-driver-x86, Corentin Chary, Matthew Garrett,
acpi4asus-user, linux-kernel
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
---
drivers/platform/x86/asus-laptop.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index e38f91b..110c777 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -863,9 +863,9 @@ static ssize_t show_infos(struct device *dev,
* The significance of others is yet to be found.
* If we don't find the method, we assume the device are present.
*/
- rv = acpi_evaluate_integer(asus->handle, "HRWS", NULL, &temp);
+ rv = acpi_evaluate_integer(asus->handle, "HWRS", NULL, &temp);
if (!ACPI_FAILURE(rv))
- len += sprintf(page + len, "HRWS value : %#x\n",
+ len += sprintf(page + len, "HWRS value : %#x\n",
(uint) temp);
/*
* Another value for userspace: the ASYM method returns 0x02 for
@@ -1751,9 +1751,9 @@ static int asus_laptop_get_info(struct asus_laptop *asus)
* The significance of others is yet to be found.
*/
status =
- acpi_evaluate_integer(asus->handle, "HRWS", NULL, &hwrs_result);
+ acpi_evaluate_integer(asus->handle, "HWRS", NULL, &hwrs_result);
if (!ACPI_FAILURE(status))
- pr_notice(" HRWS returned %x", (int)hwrs_result);
+ pr_notice(" HWRS returned %x", (int)hwrs_result);
if (!acpi_check_handle(asus->handle, METHOD_WL_STATUS, NULL))
asus->have_rsts = true;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 2/3] asus-laptop: HRWS/HWRS typo
2012-08-20 21:01 ` [PATCH 2/3] asus-laptop: HRWS/HWRS typo Corentin Chary
@ 2012-08-20 21:11 ` Alan Cox
0 siblings, 0 replies; 7+ messages in thread
From: Alan Cox @ 2012-08-20 21:11 UTC (permalink / raw)
To: Corentin Chary
Cc: Matthew Garrett, linux-acpi, platform-driver-x86, Matthew Garrett,
acpi4asus-user, linux-kernel
On Mon, 20 Aug 2012 23:01:51 +0200
Corentin Chary <corentin.chary@gmail.com> wrote:
> Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
> ---
> drivers/platform/x86/asus-laptop.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
> index e38f91b..110c777 100644
> --- a/drivers/platform/x86/asus-laptop.c
> +++ b/drivers/platform/x86/asus-laptop.c
> @@ -863,9 +863,9 @@ static ssize_t show_infos(struct device *dev,
> * The significance of others is yet to be found.
> * If we don't find the method, we assume the device are present.
> */
> - rv = acpi_evaluate_integer(asus->handle, "HRWS", NULL, &temp);
> + rv = acpi_evaluate_integer(asus->handle, "HWRS", NULL, &temp);
> if (!ACPI_FAILURE(rv))
> - len += sprintf(page + len, "HRWS value : %#x\n",
> + len += sprintf(page + len, "HWRS value : %#x\n",
> (uint) temp);
> /*
> * Another value for userspace: the ASYM method returns 0x02 for
> @@ -1751,9 +1751,9 @@ static int asus_laptop_get_info(struct asus_laptop *asus)
> * The significance of others is yet to be found.
> */
> status =
> - acpi_evaluate_integer(asus->handle, "HRWS", NULL, &hwrs_result);
> + acpi_evaluate_integer(asus->handle, "HWRS", NULL, &hwrs_result);
> if (!ACPI_FAILURE(status))
> - pr_notice(" HRWS returned %x", (int)hwrs_result);
> + pr_notice(" HWRS returned %x", (int)hwrs_result);
>
> if (!acpi_check_handle(asus->handle, METHOD_WL_STATUS, NULL))
> asus->have_rsts = true;
Please also tag this commit
Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=24222
so we can track it back out of bugzilla.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/3] platform/x86: fix asus_laptop.wled_type description
[not found] <1345496512-11780-1-git-send-email-corentin.chary@gmail.com>
2012-08-20 21:01 ` [PATCH 1/3] drivers-platform-x86: remove useless #ifdef CONFIG_ACPI_VIDEO Corentin Chary
2012-08-20 21:01 ` [PATCH 2/3] asus-laptop: HRWS/HWRS typo Corentin Chary
@ 2012-08-20 21:01 ` Corentin Chary
2 siblings, 0 replies; 7+ messages in thread
From: Corentin Chary @ 2012-08-20 21:01 UTC (permalink / raw)
To: Matthew Garrett
Cc: linux-acpi, platform-driver-x86, Maxim Nikulin, Maxim A. Nikulin,
Corentin Chary, Matthew Garrett, acpi4asus-user, linux-kernel
From: Maxim Nikulin <m.a.nikulin@gmail.com>
MODULE_PARM_DESC for wlan_status is further in the same file
Signed-off-by: Maxim A. Nikulin <M.A.Nikulin@gmail.com>
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
---
drivers/platform/x86/asus-laptop.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 110c777..4b568df 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -85,7 +85,7 @@ static char *wled_type = "unknown";
static char *bled_type = "unknown";
module_param(wled_type, charp, 0444);
-MODULE_PARM_DESC(wlan_status, "Set the wled type on boot "
+MODULE_PARM_DESC(wled_type, "Set the wled type on boot "
"(unknown, led or rfkill). "
"default is unknown");
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread