* [PATCH 00/15] acpi4asus updates
@ 2009-06-16 19:28 Corentin Chary
2009-06-16 19:28 ` [PATCH 01/15] eeepc-laptop: Register as a pci-hotplug device Corentin Chary
2009-06-18 2:41 ` [PATCH 00/15] acpi4asus updates Len Brown
0 siblings, 2 replies; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Hi Len,
It's mainly new features for eeepc-laptop and bugfix.
There is also some change for asus-laptop, which is no
longer marked as EXPERIMENTAL, when asus_acpi is now
DEPRECATED.
You can directly pull from the git tree if you want
git://git.iksaif.net/acpi4asus.git for-next
Thanks
Corentin Chary (11):
asus-laptop: platform dev as parent for led and backlight
acpi4asus: update MAINTAINER and KConfig links
asus_acpi: Deprecate in favor of asus-laptop
asus-laptop: use pr_fmt and pr_<level>
eeepc-laptop: rfkill refactoring
eeepc-laptop: right parent device
eeepc-laptop: sync eeepc-laptop with asus_acpi
eeepc-laptop: makes get_acpi() returns -ENODEV
eeepc-laptop: get the right value for CMSG
eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go
eeepc-laptop: cpufv updates
Joe Perches (1):
eeepc-laptop.c: use pr_fmt and pr_<level>
Matthew Garrett (1):
eeepc-laptop: Register as a pci-hotplug device
Pekka Enberg (1):
eeepc-laptop: enable camera by default
Randy Dunlap (1):
eeepc: fix kconfig selects
MAINTAINERS | 8 +-
drivers/platform/x86/Kconfig | 17 +-
drivers/platform/x86/asus-laptop.c | 92 ++++----
drivers/platform/x86/eeepc-laptop.c | 502 +++++++++++++++++++++++++----------
4 files changed, 428 insertions(+), 191 deletions(-)
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 01/15] eeepc-laptop: Register as a pci-hotplug device
2009-06-16 19:28 [PATCH 00/15] acpi4asus updates Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 02/15] eeepc: fix kconfig selects Corentin Chary
2009-06-18 2:41 ` [PATCH 00/15] acpi4asus updates Len Brown
1 sibling, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb
Cc: linux-acpi, Matthew Garrett, Matthew Garrett, Corentin Chary, Len Brown
From: Matthew Garrett <mjg59@srcf.ucam.org>
The eee contains a logically (but not physically) hotpluggable PCIe slot.
Currently this is handled by adding or removing the PCI device in response
to rfkill events, but if a user has forced pciehp to bind to it (with the
force=1 argument) then both drivers will try to handle the event and
hilarity (in the form of oopses) will ensue. This can be avoided by having
eee-laptop register the slot as a hotplug slot. Only one of pciehp and
eee-laptop will successfully register this, avoiding the problem.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Tested-by: Darren Salt <linux@youmustbejoking.demon.co.uk>
Signed-off-by: Len Brown <len.brown@intel.com>
---
drivers/platform/x86/Kconfig | 1 +
drivers/platform/x86/eeepc-laptop.c | 87 +++++++++++++++++++++++++++++++++++
2 files changed, 88 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 284ebac..afbe441 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -341,6 +341,7 @@ config EEEPC_LAPTOP
select BACKLIGHT_CLASS_DEVICE
select HWMON
select RFKILL
+ select HOTPLUG_PCI
---help---
This driver supports the Fn-Fx keys on Eee PC laptops.
It also adds the ability to switch camera/wlan on/off.
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 353a898..a0845b2 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -31,6 +31,7 @@
#include <linux/input.h>
#include <linux/rfkill.h>
#include <linux/pci.h>
+#include <linux/pci_hotplug.h>
#define EEEPC_LAPTOP_VERSION "0.1"
@@ -132,6 +133,7 @@ struct eeepc_hotk {
u16 *keycode_map;
struct rfkill *eeepc_wlan_rfkill;
struct rfkill *eeepc_bluetooth_rfkill;
+ struct hotplug_slot *hotplug_slot;
};
/* The actual device the driver binds to */
@@ -197,6 +199,15 @@ static struct acpi_driver eeepc_hotk_driver = {
},
};
+/* PCI hotplug ops */
+static int eeepc_get_adapter_status(struct hotplug_slot *slot, u8 *value);
+
+static struct hotplug_slot_ops eeepc_hotplug_slot_ops = {
+ .owner = THIS_MODULE,
+ .get_adapter_status = eeepc_get_adapter_status,
+ .get_power_status = eeepc_get_adapter_status,
+};
+
/* The backlight device /sys/class/backlight */
static struct backlight_device *eeepc_backlight_device;
@@ -529,6 +540,19 @@ static int notify_brn(void)
return -1;
}
+static int eeepc_get_adapter_status(struct hotplug_slot *hotplug_slot,
+ u8 *value)
+{
+ int val = get_acpi(CM_ASL_WLAN);
+
+ if (val == 1 || val == 0)
+ *value = val;
+ else
+ return -EINVAL;
+
+ return 0;
+}
+
static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
{
enum rfkill_state state;
@@ -655,6 +679,54 @@ static void eeepc_unregister_rfkill_notifier(char *node)
}
}
+static void eeepc_cleanup_pci_hotplug(struct hotplug_slot *hotplug_slot)
+{
+ kfree(hotplug_slot->info);
+ kfree(hotplug_slot);
+}
+
+static int eeepc_setup_pci_hotplug(void)
+{
+ int ret = -ENOMEM;
+ struct pci_bus *bus = pci_find_bus(0, 1);
+
+ if (!bus) {
+ printk(EEEPC_ERR "Unable to find wifi PCI bus\n");
+ return -ENODEV;
+ }
+
+ ehotk->hotplug_slot = kzalloc(sizeof(struct hotplug_slot), GFP_KERNEL);
+ if (!ehotk->hotplug_slot)
+ goto error_slot;
+
+ ehotk->hotplug_slot->info = kzalloc(sizeof(struct hotplug_slot_info),
+ GFP_KERNEL);
+ if (!ehotk->hotplug_slot->info)
+ goto error_info;
+
+ ehotk->hotplug_slot->private = ehotk;
+ ehotk->hotplug_slot->release = &eeepc_cleanup_pci_hotplug;
+ ehotk->hotplug_slot->ops = &eeepc_hotplug_slot_ops;
+ eeepc_get_adapter_status(ehotk->hotplug_slot,
+ &ehotk->hotplug_slot->info->adapter_status);
+
+ ret = pci_hp_register(ehotk->hotplug_slot, bus, 0, "eeepc-wifi");
+ if (ret) {
+ printk(EEEPC_ERR "Unable to register hotplug slot - %d\n", ret);
+ goto error_register;
+ }
+
+ return 0;
+
+error_register:
+ kfree(ehotk->hotplug_slot->info);
+error_info:
+ kfree(ehotk->hotplug_slot);
+ ehotk->hotplug_slot = NULL;
+error_slot:
+ return ret;
+}
+
static int eeepc_hotk_add(struct acpi_device *device)
{
acpi_status status = AE_OK;
@@ -738,8 +810,21 @@ static int eeepc_hotk_add(struct acpi_device *device)
goto bluetooth_fail;
}
+ result = eeepc_setup_pci_hotplug();
+ /*
+ * If we get -EBUSY then something else is handling the PCI hotplug -
+ * don't fail in this case
+ */
+ if (result == -EBUSY)
+ return 0;
+ else if (result)
+ goto pci_fail;
+
return 0;
+ pci_fail:
+ if (ehotk->eeepc_bluetooth_rfkill)
+ rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
bluetooth_fail:
if (ehotk->eeepc_bluetooth_rfkill)
rfkill_free(ehotk->eeepc_bluetooth_rfkill);
@@ -770,6 +855,8 @@ static int eeepc_hotk_remove(struct acpi_device *device, int type)
eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
+ if (ehotk->hotplug_slot)
+ pci_hp_deregister(ehotk->hotplug_slot);
kfree(ehotk);
return 0;
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 02/15] eeepc: fix kconfig selects
2009-06-16 19:28 ` [PATCH 01/15] eeepc-laptop: Register as a pci-hotplug device Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 03/15] eeepc-laptop.c: use pr_fmt and pr_<level> Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Randy Dunlap
From: Randy Dunlap <randy.dunlap@oracle.com>
EEEPC_LAPTOP selects HOTPLUG_PCI. This causes failures (build error below)
when CONFIG_HOTPLUG is not enabled, so additionally select HOTPLUG since
kconfig 'select' doesn't follow its dependency chain.
Also, only select HOTPLUG_PCI if PCI is already enabled.
drivers/pci/hotplug/fakephp.c:55: error: implicit declaration of function 'pci_rescan_bus'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/Kconfig | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index afbe441..db299e1 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -341,7 +341,8 @@ config EEEPC_LAPTOP
select BACKLIGHT_CLASS_DEVICE
select HWMON
select RFKILL
- select HOTPLUG_PCI
+ select HOTPLUG
+ select HOTPLUG_PCI if PCI
---help---
This driver supports the Fn-Fx keys on Eee PC laptops.
It also adds the ability to switch camera/wlan on/off.
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 03/15] eeepc-laptop.c: use pr_fmt and pr_<level>
2009-06-16 19:28 ` [PATCH 02/15] eeepc: fix kconfig selects Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 04/15] eeepc-laptop: enable camera by default Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Joe Perches, Corentin Chary
From: Joe Perches <joe@perches.com>
Convert the unusual printk(EEEPC_<level> uses to
the more standard pr_fmt and pr_<level>(.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 59 ++++++++++++++--------------------
1 files changed, 24 insertions(+), 35 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index a0845b2..51b07c6 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -16,6 +16,8 @@
* GNU General Public License for more details.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -41,11 +43,6 @@
#define EEEPC_HOTK_DEVICE_NAME "Hotkey"
#define EEEPC_HOTK_HID "ASUS010"
-#define EEEPC_LOG EEEPC_HOTK_FILE ": "
-#define EEEPC_ERR KERN_ERR EEEPC_LOG
-#define EEEPC_WARNING KERN_WARNING EEEPC_LOG
-#define EEEPC_NOTICE KERN_NOTICE EEEPC_LOG
-#define EEEPC_INFO KERN_INFO EEEPC_LOG
/*
* Definitions for Asus EeePC
@@ -269,7 +266,7 @@ static int set_acpi(int cm, int value)
if (method == NULL)
return -ENODEV;
if (write_acpi_int(ehotk->handle, method, value, NULL))
- printk(EEEPC_WARNING "Error writing %s\n", method);
+ pr_warning("Error writing %s\n", method);
}
return 0;
}
@@ -282,7 +279,7 @@ static int get_acpi(int cm)
if (method == NULL)
return -ENODEV;
if (read_acpi_int(ehotk->handle, method, &value))
- printk(EEEPC_WARNING "Error reading %s\n", method);
+ pr_warning("Error reading %s\n", method);
}
return value;
}
@@ -479,26 +476,23 @@ static int eeepc_hotk_check(void)
if (ehotk->device->status.present) {
if (write_acpi_int(ehotk->handle, "INIT", ehotk->init_flag,
&buffer)) {
- printk(EEEPC_ERR "Hotkey initialization failed\n");
+ pr_err("Hotkey initialization failed\n");
return -ENODEV;
} else {
- printk(EEEPC_NOTICE "Hotkey init flags 0x%x\n",
- ehotk->init_flag);
+ pr_notice("Hotkey init flags 0x%x\n", ehotk->init_flag);
}
/* get control methods supported */
if (read_acpi_int(ehotk->handle, "CMSG"
, &ehotk->cm_supported)) {
- printk(EEEPC_ERR
- "Get control methods supported failed\n");
+ pr_err("Get control methods supported failed\n");
return -ENODEV;
} else {
- printk(EEEPC_INFO
- "Get control methods supported: 0x%x\n",
- ehotk->cm_supported);
+ pr_info("Get control methods supported: 0x%x\n",
+ ehotk->cm_supported);
}
ehotk->inputdev = input_allocate_device();
if (!ehotk->inputdev) {
- printk(EEEPC_INFO "Unable to allocate input device\n");
+ pr_info("Unable to allocate input device\n");
return 0;
}
ehotk->inputdev->name = "Asus EeePC extra buttons";
@@ -517,12 +511,12 @@ static int eeepc_hotk_check(void)
}
result = input_register_device(ehotk->inputdev);
if (result) {
- printk(EEEPC_INFO "Unable to register input device\n");
+ pr_info("Unable to register input device\n");
input_free_device(ehotk->inputdev);
return 0;
}
} else {
- printk(EEEPC_ERR "Hotkey device not present, aborting\n");
+ pr_err("Hotkey device not present, aborting\n");
return -EINVAL;
}
return 0;
@@ -563,7 +557,7 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
return;
if (!bus) {
- printk(EEEPC_WARNING "Unable to find PCI bus 1?\n");
+ pr_warning("Unable to find PCI bus 1?\n");
return;
}
@@ -580,7 +574,7 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
if (dev) {
pci_bus_assign_resources(bus);
if (pci_bus_add_device(dev))
- printk(EEEPC_ERR "Unable to hotplug wifi\n");
+ pr_err("Unable to hotplug wifi\n");
}
} else {
dev = pci_get_slot(bus, 0);
@@ -653,8 +647,7 @@ static int eeepc_register_rfkill_notifier(char *node)
eeepc_rfkill_notify,
NULL);
if (ACPI_FAILURE(status))
- printk(EEEPC_WARNING
- "Failed to register notify on %s\n", node);
+ pr_warning("Failed to register notify on %s\n", node);
} else
return -ENODEV;
@@ -673,8 +666,7 @@ static void eeepc_unregister_rfkill_notifier(char *node)
ACPI_SYSTEM_NOTIFY,
eeepc_rfkill_notify);
if (ACPI_FAILURE(status))
- printk(EEEPC_ERR
- "Error removing rfkill notify handler %s\n",
+ pr_err("Error removing rfkill notify handler %s\n",
node);
}
}
@@ -691,7 +683,7 @@ static int eeepc_setup_pci_hotplug(void)
struct pci_bus *bus = pci_find_bus(0, 1);
if (!bus) {
- printk(EEEPC_ERR "Unable to find wifi PCI bus\n");
+ pr_err("Unable to find wifi PCI bus\n");
return -ENODEV;
}
@@ -712,7 +704,7 @@ static int eeepc_setup_pci_hotplug(void)
ret = pci_hp_register(ehotk->hotplug_slot, bus, 0, "eeepc-wifi");
if (ret) {
- printk(EEEPC_ERR "Unable to register hotplug slot - %d\n", ret);
+ pr_err("Unable to register hotplug slot - %d\n", ret);
goto error_register;
}
@@ -734,7 +726,7 @@ static int eeepc_hotk_add(struct acpi_device *device)
if (!device)
return -EINVAL;
- printk(EEEPC_NOTICE EEEPC_HOTK_NAME "\n");
+ pr_notice(EEEPC_HOTK_NAME "\n");
ehotk = kzalloc(sizeof(struct eeepc_hotk), GFP_KERNEL);
if (!ehotk)
return -ENOMEM;
@@ -750,7 +742,7 @@ static int eeepc_hotk_add(struct acpi_device *device)
status = acpi_install_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY,
eeepc_hotk_notify, ehotk);
if (ACPI_FAILURE(status))
- printk(EEEPC_ERR "Error installing notify handler\n");
+ pr_err("Error installing notify handler\n");
eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
@@ -851,7 +843,7 @@ static int eeepc_hotk_remove(struct acpi_device *device, int type)
status = acpi_remove_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY,
eeepc_hotk_notify);
if (ACPI_FAILURE(status))
- printk(EEEPC_ERR "Error removing notify handler\n");
+ pr_err("Error removing notify handler\n");
eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
@@ -1023,8 +1015,7 @@ static int eeepc_backlight_init(struct device *dev)
bd = backlight_device_register(EEEPC_HOTK_FILE, dev,
NULL, &eeepcbl_ops);
if (IS_ERR(bd)) {
- printk(EEEPC_ERR
- "Could not register eeepc backlight device\n");
+ pr_err("Could not register eeepc backlight device\n");
eeepc_backlight_device = NULL;
return PTR_ERR(bd);
}
@@ -1043,8 +1034,7 @@ static int eeepc_hwmon_init(struct device *dev)
hwmon = hwmon_device_register(dev);
if (IS_ERR(hwmon)) {
- printk(EEEPC_ERR
- "Could not register eeepc hwmon device\n");
+ pr_err("Could not register eeepc hwmon device\n");
eeepc_hwmon_device = NULL;
return PTR_ERR(hwmon);
}
@@ -1077,8 +1067,7 @@ static int __init eeepc_laptop_init(void)
if (result)
goto fail_backlight;
} else
- printk(EEEPC_INFO "Backlight controlled by ACPI video "
- "driver\n");
+ pr_info("Backlight controlled by ACPI video driver\n");
result = eeepc_hwmon_init(dev);
if (result)
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 04/15] eeepc-laptop: enable camera by default
2009-06-16 19:28 ` [PATCH 03/15] eeepc-laptop.c: use pr_fmt and pr_<level> Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 05/15] asus-laptop: platform dev as parent for led and backlight Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Pekka Enberg, Andrew Morton, Corentin Chary
From: Pekka Enberg <penberg@cs.helsinki.fi>
If we leave the camera disabled by default, userspace programs (e.g.
Skype, Cheese) leave the user out in the cold saying that the machine
"has no camera." Therefore, it's better to enable camera by default and
let people who really don't want it just disable the thing.
To reduce power usage you should enable USB autosuspend:
echo -n auto > /sys/bus/usb/drivers/uvcvideo/*:*/../power/level
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 51b07c6..2a03425 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -341,6 +341,15 @@ static int eeepc_bluetooth_rfkill_state(void *data, enum rfkill_state *state)
return 0;
}
+static void __init eeepc_enable_camera(void)
+{
+ /*
+ * If the following call to set_acpi() fails, it's because there's no
+ * camera so we can ignore the error.
+ */
+ set_acpi(CM_ASL_CAMERA, 1);
+}
+
/*
* Sys helpers
*/
@@ -1072,6 +1081,9 @@ static int __init eeepc_laptop_init(void)
result = eeepc_hwmon_init(dev);
if (result)
goto fail_hwmon;
+
+ eeepc_enable_camera();
+
/* Register platform stuff */
result = platform_driver_register(&platform_driver);
if (result)
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 05/15] asus-laptop: platform dev as parent for led and backlight
2009-06-16 19:28 ` [PATCH 04/15] eeepc-laptop: enable camera by default Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 06/15] acpi4asus: update MAINTAINER and KConfig links Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Makes asus-laptop platform device the parent device of
backlight and led classes.
With this patch, leds and backlight are also available in
/sys/devices/platform/asus-laptop/ like thinkpad_acpi.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/asus-laptop.c | 40 +++++++++++++++++------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index bfc1a88..a033355 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -1334,7 +1334,6 @@ out:
static int __init asus_laptop_init(void)
{
- struct device *dev;
int result;
if (acpi_disabled)
@@ -1356,24 +1355,10 @@ static int __init asus_laptop_init(void)
return -ENODEV;
}
- dev = acpi_get_physical_device(hotk->device->handle);
-
- if (!acpi_video_backlight_support()) {
- result = asus_backlight_init(dev);
- if (result)
- goto fail_backlight;
- } else
- printk(ASUS_INFO "Brightness ignored, must be controlled by "
- "ACPI video driver\n");
-
result = asus_input_init();
if (result)
goto fail_input;
- result = asus_led_init(dev);
- if (result)
- goto fail_led;
-
/* Register platform stuff */
result = platform_driver_register(&asuspf_driver);
if (result)
@@ -1394,8 +1379,27 @@ static int __init asus_laptop_init(void)
if (result)
goto fail_sysfs;
+ result = asus_led_init(&asuspf_device->dev);
+ if (result)
+ goto fail_led;
+
+ if (!acpi_video_backlight_support()) {
+ result = asus_backlight_init(&asuspf_device->dev);
+ if (result)
+ goto fail_backlight;
+ } else
+ printk(ASUS_INFO "Brightness ignored, must be controlled by "
+ "ACPI video driver\n");
+
return 0;
+fail_backlight:
+ asus_led_exit();
+
+fail_led:
+ sysfs_remove_group(&asuspf_device->dev.kobj,
+ &asuspf_attribute_group);
+
fail_sysfs:
platform_device_del(asuspf_device);
@@ -1406,15 +1410,9 @@ fail_platform_device1:
platform_driver_unregister(&asuspf_driver);
fail_platform_driver:
- asus_led_exit();
-
-fail_led:
asus_input_exit();
fail_input:
- asus_backlight_exit();
-
-fail_backlight:
return result;
}
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 06/15] acpi4asus: update MAINTAINER and KConfig links
2009-06-16 19:28 ` [PATCH 05/15] asus-laptop: platform dev as parent for led and backlight Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 07/15] asus_acpi: Deprecate in favor of asus-laptop Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
The bug tracker have moved from sourceforge to
http://dev.iksaif.net . The homepage of the project
is now http://acpi4asus.sf.net with links to the new
bug tracker. No change for the mailing list.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
MAINTAINERS | 8 +++-----
drivers/platform/x86/Kconfig | 11 +++++++----
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 41c6605..7d2cc15 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -874,8 +874,7 @@ M: corentincj@iksaif.net
P: Karol Kozimor
M: sziwan@users.sourceforge.net
L: acpi4asus-user@lists.sourceforge.net
-W: http://sourceforge.net/projects/acpi4asus
-W: http://xf.iksaif.net/acpi4asus
+W: http://acpi4asus.sf.net
S: Maintained
F: arch/x86/kernel/acpi/boot.c
F: drivers/platform/x86/asus_acpi.c
@@ -891,8 +890,7 @@ ASUS LAPTOP EXTRAS DRIVER
P: Corentin Chary
M: corentincj@iksaif.net
L: acpi4asus-user@lists.sourceforge.net
-W: http://sourceforge.net/projects/acpi4asus
-W: http://xf.iksaif.net/acpi4asus
+W: http://acpi4asus.sf.net
S: Maintained
F: drivers/platform/x86/asus-laptop.c
@@ -2049,7 +2047,7 @@ EEEPC LAPTOP EXTRAS DRIVER
P: Corentin Chary
M: corentincj@iksaif.net
L: acpi4asus-user@lists.sourceforge.net
-W: http://sourceforge.net/projects/acpi4asus
+W: http://acpi4asus.sf.net
S: Maintained
F: drivers/platform/x86/eeepc-laptop.c
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 284ebac..a5386b2 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -45,12 +45,12 @@ config ASUS_LAPTOP
---help---
This is the new Linux driver for Asus laptops. It may also support some
MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
- standard ACPI events that go through /proc/acpi/events. It also adds
+ standard ACPI events and input events. It also adds
support for video output switching, LCD backlight control, Bluetooth and
Wlan control, and most importantly, allows you to blink those fancy LEDs.
For more information and a userspace daemon for handling the extra
- buttons see <http://acpi4asus.sf.net/>.
+ buttons see <http://acpi4asus.sf.net>.
If you have an ACPI-compatible ASUS laptop, say Y or M here.
@@ -343,7 +343,10 @@ config EEEPC_LAPTOP
select RFKILL
---help---
This driver supports the Fn-Fx keys on Eee PC laptops.
- It also adds the ability to switch camera/wlan on/off.
+
+ It also gives access to some extra laptop functionalities like
+ Bluetooth, backlight and allows powering on/off some other
+ devices.
If you have an Eee PC laptop, say Y or M here.
@@ -391,7 +394,7 @@ config ACPI_ASUS
parameters.
More information and a userspace daemon for handling the extra buttons
- at <http://sourceforge.net/projects/acpi4asus/>.
+ at <http://acpi4asus.sf.net>.
If you have an ACPI-compatible ASUS laptop, say Y or M here. This
driver is still under development, so if your laptop is unsupported or
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 07/15] asus_acpi: Deprecate in favor of asus-laptop
2009-06-16 19:28 ` [PATCH 06/15] acpi4asus: update MAINTAINER and KConfig links Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 08/15] asus-laptop: use pr_fmt and pr_<level> Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
asus-laptop have been merged in the kernel two years ago,
it is now stable and used by most distribution instead of
the old asus_acpi driver.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/Kconfig | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index a5386b2..bb538d5 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -35,7 +35,7 @@ config ACER_WMI
here.
config ASUS_LAPTOP
- tristate "Asus Laptop Extras (EXPERIMENTAL)"
+ tristate "Asus Laptop Extras"
depends on ACPI
depends on EXPERIMENTAL && !ACPI_ASUS
select LEDS_CLASS
@@ -373,7 +373,7 @@ config ACPI_WMI
any ACPI-WMI devices.
config ACPI_ASUS
- tristate "ASUS/Medion Laptop Extras"
+ tristate "ASUS/Medion Laptop Extras (DEPRECATED)"
depends on ACPI
select BACKLIGHT_CLASS_DEVICE
---help---
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 08/15] asus-laptop: use pr_fmt and pr_<level>
2009-06-16 19:28 ` [PATCH 07/15] asus_acpi: Deprecate in favor of asus-laptop Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 09/15] eeepc-laptop: rfkill refactoring Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Convert the unusual printk(ASUS_<level> uses to
the more standard pr_fmt and pr_<level>(.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/asus-laptop.c | 54 ++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index a033355..14e33b0 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -33,6 +33,8 @@
* Sam Lin - GPS support
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -53,9 +55,10 @@
#define ASUS_HOTK_NAME "Asus Laptop Support"
#define ASUS_HOTK_CLASS "hotkey"
#define ASUS_HOTK_DEVICE_NAME "Hotkey"
-#define ASUS_HOTK_FILE "asus-laptop"
+#define ASUS_HOTK_FILE KBUILD_MODNAME
#define ASUS_HOTK_PREFIX "\\_SB.ATKD."
+
/*
* Some events we use, same for all Asus
*/
@@ -323,7 +326,7 @@ static int read_wireless_status(int mask)
rv = acpi_evaluate_integer(wireless_status_handle, NULL, NULL, &status);
if (ACPI_FAILURE(rv))
- printk(ASUS_WARNING "Error reading Wireless status\n");
+ pr_warning("Error reading Wireless status\n");
else
return (status & mask) ? 1 : 0;
@@ -337,7 +340,7 @@ static int read_gps_status(void)
rv = acpi_evaluate_integer(gps_status_handle, NULL, NULL, &status);
if (ACPI_FAILURE(rv))
- printk(ASUS_WARNING "Error reading GPS status\n");
+ pr_warning("Error reading GPS status\n");
else
return status ? 1 : 0;
@@ -377,7 +380,7 @@ static void write_status(acpi_handle handle, int out, int mask)
}
if (write_acpi_int(handle, NULL, out, NULL))
- printk(ASUS_WARNING " write failed %x\n", mask);
+ pr_warning(" write failed %x\n", mask);
}
/* /sys/class/led handlers */
@@ -420,7 +423,7 @@ static int set_lcd_state(int value)
NULL, NULL, NULL);
if (ACPI_FAILURE(status))
- printk(ASUS_WARNING "Error switching LCD\n");
+ pr_warning("Error switching LCD\n");
}
write_status(NULL, lcd, LCD_ON);
@@ -444,7 +447,7 @@ static int read_brightness(struct backlight_device *bd)
rv = acpi_evaluate_integer(brightness_get_handle, NULL, NULL, &value);
if (ACPI_FAILURE(rv))
- printk(ASUS_WARNING "Error reading brightness\n");
+ pr_warning("Error reading brightness\n");
return value;
}
@@ -457,7 +460,7 @@ static int set_brightness(struct backlight_device *bd, int value)
/* 0 <= value <= 15 */
if (write_acpi_int(brightness_set_handle, NULL, value, NULL)) {
- printk(ASUS_WARNING "Error changing brightness\n");
+ pr_warning("Error changing brightness\n");
ret = -EIO;
}
@@ -587,7 +590,7 @@ static ssize_t store_ledd(struct device *dev, struct device_attribute *attr,
rv = parse_arg(buf, count, &value);
if (rv > 0) {
if (write_acpi_int(ledd_set_handle, NULL, value, NULL))
- printk(ASUS_WARNING "LED display write failed\n");
+ pr_warning("LED display write failed\n");
else
hotk->ledd_status = (u32) value;
}
@@ -632,7 +635,7 @@ static void set_display(int value)
{
/* no sanity check needed for now */
if (write_acpi_int(display_set_handle, NULL, value, NULL))
- printk(ASUS_WARNING "Error setting display\n");
+ pr_warning("Error setting display\n");
return;
}
@@ -647,7 +650,7 @@ static int read_display(void)
rv = acpi_evaluate_integer(display_get_handle, NULL,
NULL, &value);
if (ACPI_FAILURE(rv))
- printk(ASUS_WARNING "Error reading display status\n");
+ pr_warning("Error reading display status\n");
}
value &= 0x0F; /* needed for some models, shouldn't hurt others */
@@ -689,7 +692,7 @@ static ssize_t store_disp(struct device *dev, struct device_attribute *attr,
static void set_light_sens_switch(int value)
{
if (write_acpi_int(ls_switch_handle, NULL, value, NULL))
- printk(ASUS_WARNING "Error setting light sensor switch\n");
+ pr_warning("Error setting light sensor switch\n");
hotk->light_switch = value;
}
@@ -714,7 +717,7 @@ static ssize_t store_lssw(struct device *dev, struct device_attribute *attr,
static void set_light_sens_level(int value)
{
if (write_acpi_int(ls_level_handle, NULL, value, NULL))
- printk(ASUS_WARNING "Error setting light sensor level\n");
+ pr_warning("Error setting light sensor level\n");
hotk->light_level = value;
}
@@ -975,11 +978,11 @@ static int asus_hotk_get_info(void)
*/
status = acpi_get_table(ACPI_SIG_DSDT, 1, &asus_info);
if (ACPI_FAILURE(status))
- printk(ASUS_WARNING "Couldn't get the DSDT table header\n");
+ pr_warning("Couldn't get the DSDT table header\n");
/* We have to write 0 on init this far for all ASUS models */
if (write_acpi_int(hotk->handle, "INIT", 0, &buffer)) {
- printk(ASUS_ERR "Hotkey initialization failed\n");
+ pr_err("Hotkey initialization failed\n");
return -ENODEV;
}
@@ -987,9 +990,9 @@ static int asus_hotk_get_info(void)
status =
acpi_evaluate_integer(hotk->handle, "BSTS", NULL, &bsts_result);
if (ACPI_FAILURE(status))
- printk(ASUS_WARNING "Error calling BSTS\n");
+ pr_warning("Error calling BSTS\n");
else if (bsts_result)
- printk(ASUS_NOTICE "BSTS called, 0x%02x returned\n",
+ pr_notice("BSTS called, 0x%02x returned\n",
(uint) bsts_result);
/* This too ... */
@@ -1020,7 +1023,7 @@ static int asus_hotk_get_info(void)
return -ENOMEM;
if (*string)
- printk(ASUS_NOTICE " %s model detected\n", string);
+ pr_notice(" %s model detected\n", string);
ASUS_HANDLE_INIT(mled_set);
ASUS_HANDLE_INIT(tled_set);
@@ -1077,7 +1080,7 @@ static int asus_input_init(void)
hotk->inputdev = input_allocate_device();
if (!hotk->inputdev) {
- printk(ASUS_INFO "Unable to allocate input device\n");
+ pr_info("Unable to allocate input device\n");
return 0;
}
hotk->inputdev->name = "Asus Laptop extra buttons";
@@ -1096,7 +1099,7 @@ static int asus_input_init(void)
}
result = input_register_device(hotk->inputdev);
if (result) {
- printk(ASUS_INFO "Unable to register input device\n");
+ pr_info("Unable to register input device\n");
input_free_device(hotk->inputdev);
}
return result;
@@ -1113,7 +1116,7 @@ static int asus_hotk_check(void)
if (hotk->device->status.present) {
result = asus_hotk_get_info();
} else {
- printk(ASUS_ERR "Hotkey device not present, aborting\n");
+ pr_err("Hotkey device not present, aborting\n");
return -EINVAL;
}
@@ -1130,7 +1133,7 @@ static int asus_hotk_add(struct acpi_device *device)
if (!device)
return -EINVAL;
- printk(ASUS_NOTICE "Asus Laptop Support version %s\n",
+ pr_notice("Asus Laptop Support version %s\n",
ASUS_LAPTOP_VERSION);
hotk = kzalloc(sizeof(struct asus_hotk), GFP_KERNEL);
@@ -1156,7 +1159,7 @@ static int asus_hotk_add(struct acpi_device *device)
status = acpi_install_notify_handler(hotk->handle, ACPI_ALL_NOTIFY,
asus_hotk_notify, hotk);
if (ACPI_FAILURE(status))
- printk(ASUS_ERR "Error installing notify handler\n");
+ pr_err("Error installing notify handler\n");
asus_hotk_found = 1;
@@ -1206,7 +1209,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type)
status = acpi_remove_notify_handler(hotk->handle, ACPI_ALL_NOTIFY,
asus_hotk_notify);
if (ACPI_FAILURE(status))
- printk(ASUS_ERR "Error removing notify handler\n");
+ pr_err("Error removing notify handler\n");
kfree(hotk->name);
kfree(hotk);
@@ -1260,8 +1263,7 @@ static int asus_backlight_init(struct device *dev)
bd = backlight_device_register(ASUS_HOTK_FILE, dev,
NULL, &asusbl_ops);
if (IS_ERR(bd)) {
- printk(ASUS_ERR
- "Could not register asus backlight device\n");
+ pr_err("Could not register asus backlight device\n");
asus_backlight_device = NULL;
return PTR_ERR(bd);
}
@@ -1388,7 +1390,7 @@ static int __init asus_laptop_init(void)
if (result)
goto fail_backlight;
} else
- printk(ASUS_INFO "Brightness ignored, must be controlled by "
+ pr_info("Brightness ignored, must be controlled by "
"ACPI video driver\n");
return 0;
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 09/15] eeepc-laptop: rfkill refactoring
2009-06-16 19:28 ` [PATCH 08/15] asus-laptop: use pr_fmt and pr_<level> Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 10/15] eeepc-laptop: right parent device Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Refactor rfkill code, because we'll add another
rfkill for wwan3g later.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 189 +++++++++++++++++------------------
1 files changed, 94 insertions(+), 95 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 2a03425..7b7c750 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -128,8 +128,8 @@ struct eeepc_hotk {
u16 event_count[128]; /* count for each event */
struct input_dev *inputdev;
u16 *keycode_map;
- struct rfkill *eeepc_wlan_rfkill;
- struct rfkill *eeepc_bluetooth_rfkill;
+ struct rfkill *wlan_rfkill;
+ struct rfkill *bluetooth_rfkill;
struct hotplug_slot *hotplug_slot;
};
@@ -570,7 +570,7 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
return;
}
- eeepc_wlan_rfkill_state(ehotk->eeepc_wlan_rfkill, &state);
+ eeepc_wlan_rfkill_state(ehotk->wlan_rfkill, &state);
if (state == RFKILL_STATE_UNBLOCKED) {
dev = pci_get_slot(bus, 0);
@@ -593,7 +593,7 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
}
}
- rfkill_force_state(ehotk->eeepc_wlan_rfkill, state);
+ rfkill_force_state(ehotk->wlan_rfkill, state);
}
static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
@@ -753,89 +753,8 @@ static int eeepc_hotk_add(struct acpi_device *device)
if (ACPI_FAILURE(status))
pr_err("Error installing notify handler\n");
- eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
- eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
-
- if (get_acpi(CM_ASL_WLAN) != -1) {
- ehotk->eeepc_wlan_rfkill = rfkill_allocate(&device->dev,
- RFKILL_TYPE_WLAN);
-
- if (!ehotk->eeepc_wlan_rfkill)
- goto wlan_fail;
-
- ehotk->eeepc_wlan_rfkill->name = "eeepc-wlan";
- ehotk->eeepc_wlan_rfkill->toggle_radio = eeepc_wlan_rfkill_set;
- ehotk->eeepc_wlan_rfkill->get_state = eeepc_wlan_rfkill_state;
- if (get_acpi(CM_ASL_WLAN) == 1) {
- ehotk->eeepc_wlan_rfkill->state =
- RFKILL_STATE_UNBLOCKED;
- rfkill_set_default(RFKILL_TYPE_WLAN,
- RFKILL_STATE_UNBLOCKED);
- } else {
- ehotk->eeepc_wlan_rfkill->state =
- RFKILL_STATE_SOFT_BLOCKED;
- rfkill_set_default(RFKILL_TYPE_WLAN,
- RFKILL_STATE_SOFT_BLOCKED);
- }
- result = rfkill_register(ehotk->eeepc_wlan_rfkill);
- if (result)
- goto wlan_fail;
- }
-
- if (get_acpi(CM_ASL_BLUETOOTH) != -1) {
- ehotk->eeepc_bluetooth_rfkill =
- rfkill_allocate(&device->dev, RFKILL_TYPE_BLUETOOTH);
-
- if (!ehotk->eeepc_bluetooth_rfkill)
- goto bluetooth_fail;
-
- ehotk->eeepc_bluetooth_rfkill->name = "eeepc-bluetooth";
- ehotk->eeepc_bluetooth_rfkill->toggle_radio =
- eeepc_bluetooth_rfkill_set;
- ehotk->eeepc_bluetooth_rfkill->get_state =
- eeepc_bluetooth_rfkill_state;
- if (get_acpi(CM_ASL_BLUETOOTH) == 1) {
- ehotk->eeepc_bluetooth_rfkill->state =
- RFKILL_STATE_UNBLOCKED;
- rfkill_set_default(RFKILL_TYPE_BLUETOOTH,
- RFKILL_STATE_UNBLOCKED);
- } else {
- ehotk->eeepc_bluetooth_rfkill->state =
- RFKILL_STATE_SOFT_BLOCKED;
- rfkill_set_default(RFKILL_TYPE_BLUETOOTH,
- RFKILL_STATE_SOFT_BLOCKED);
- }
-
- result = rfkill_register(ehotk->eeepc_bluetooth_rfkill);
- if (result)
- goto bluetooth_fail;
- }
-
- result = eeepc_setup_pci_hotplug();
- /*
- * If we get -EBUSY then something else is handling the PCI hotplug -
- * don't fail in this case
- */
- if (result == -EBUSY)
- return 0;
- else if (result)
- goto pci_fail;
-
return 0;
- pci_fail:
- if (ehotk->eeepc_bluetooth_rfkill)
- rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
- bluetooth_fail:
- if (ehotk->eeepc_bluetooth_rfkill)
- rfkill_free(ehotk->eeepc_bluetooth_rfkill);
- rfkill_unregister(ehotk->eeepc_wlan_rfkill);
- ehotk->eeepc_wlan_rfkill = NULL;
- wlan_fail:
- if (ehotk->eeepc_wlan_rfkill)
- rfkill_free(ehotk->eeepc_wlan_rfkill);
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
ehotk_fail:
kfree(ehotk);
ehotk = NULL;
@@ -854,11 +773,6 @@ static int eeepc_hotk_remove(struct acpi_device *device, int type)
if (ACPI_FAILURE(status))
pr_err("Error removing notify handler\n");
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
- if (ehotk->hotplug_slot)
- pci_hp_deregister(ehotk->hotplug_slot);
-
kfree(ehotk);
return 0;
}
@@ -979,10 +893,14 @@ static void eeepc_backlight_exit(void)
static void eeepc_rfkill_exit(void)
{
- if (ehotk->eeepc_wlan_rfkill)
- rfkill_unregister(ehotk->eeepc_wlan_rfkill);
- if (ehotk->eeepc_bluetooth_rfkill)
- rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
+ eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
+ eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
+ if (ehotk->wlan_rfkill)
+ rfkill_unregister(ehotk->wlan_rfkill);
+ if (ehotk->bluetooth_rfkill)
+ rfkill_unregister(ehotk->bluetooth_rfkill);
+ if (ehotk->hotplug_slot)
+ pci_hp_deregister(ehotk->hotplug_slot);
}
static void eeepc_input_exit(void)
@@ -1017,6 +935,80 @@ static void __exit eeepc_laptop_exit(void)
platform_driver_unregister(&platform_driver);
}
+static int eeepc_new_rfkill(struct rfkill **rfkill,
+ const char *name, struct device *dev,
+ enum rfkill_type type, int cm,
+ int (*toggle)(void *, enum rfkill_state),
+ int (*get)(void *, enum rfkill_state *))
+{
+ int result;
+
+ if (get_acpi(cm) == -1)
+ return -ENODEV;
+
+ *rfkill = rfkill_allocate(dev, type);
+ if (!*rfkill)
+ return -EINVAL;
+
+ (*rfkill)->name = name;
+ (*rfkill)->toggle_radio = toggle;
+ (*rfkill)->get_state = get;
+ if (get_acpi(cm) == 1) {
+ (*rfkill)->state = RFKILL_STATE_UNBLOCKED;
+ rfkill_set_default(type, RFKILL_STATE_UNBLOCKED);
+ } else {
+ (*rfkill)->state = RFKILL_STATE_SOFT_BLOCKED;
+ rfkill_set_default(type, RFKILL_STATE_SOFT_BLOCKED);
+ }
+ result = rfkill_register(*rfkill);
+ if (result) {
+ rfkill_free(*rfkill);
+ *rfkill = NULL;
+ return result;
+ }
+ return 0;
+}
+
+
+static int eeepc_rfkill_init(struct device *dev)
+{
+ int result = 0;
+
+ eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
+ eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
+
+ result = eeepc_new_rfkill(&ehotk->wlan_rfkill,
+ "eeepc-wlan", dev,
+ RFKILL_TYPE_WLAN, CM_ASL_WLAN,
+ eeepc_wlan_rfkill_set,
+ eeepc_wlan_rfkill_state);
+
+ if (result && result != -ENODEV)
+ goto exit;
+
+ result = eeepc_new_rfkill(&ehotk->bluetooth_rfkill,
+ "eeepc-bluetooth", dev,
+ RFKILL_TYPE_BLUETOOTH, CM_ASL_BLUETOOTH,
+ eeepc_bluetooth_rfkill_set,
+ eeepc_bluetooth_rfkill_state);
+
+ if (result && result != -ENODEV)
+ goto exit;
+
+ result = eeepc_setup_pci_hotplug();
+ /*
+ * If we get -EBUSY then something else is handling the PCI hotplug -
+ * don't fail in this case
+ */
+ if (result == -EBUSY)
+ result = 0;
+
+exit:
+ if (result && result != -ENODEV)
+ eeepc_rfkill_exit();
+ return result;
+}
+
static int eeepc_backlight_init(struct device *dev)
{
struct backlight_device *bd;
@@ -1100,7 +1092,15 @@ static int __init eeepc_laptop_init(void)
&platform_attribute_group);
if (result)
goto fail_sysfs;
+
+ result = eeepc_rfkill_init(dev);
+ if (result)
+ goto fail_rfkill;
+
return 0;
+fail_rfkill:
+ sysfs_remove_group(&platform_device->dev.kobj,
+ &platform_attribute_group);
fail_sysfs:
platform_device_del(platform_device);
fail_platform_device2:
@@ -1113,7 +1113,6 @@ fail_hwmon:
eeepc_backlight_exit();
fail_backlight:
eeepc_input_exit();
- eeepc_rfkill_exit();
return result;
}
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 10/15] eeepc-laptop: right parent device
2009-06-16 19:28 ` [PATCH 09/15] eeepc-laptop: rfkill refactoring Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 11/15] eeepc-laptop: sync eeepc-laptop with asus_acpi Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 7b7c750..7121239 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -1061,18 +1061,6 @@ static int __init eeepc_laptop_init(void)
acpi_bus_unregister_driver(&eeepc_hotk_driver);
return -ENODEV;
}
- dev = acpi_get_physical_device(ehotk->device->handle);
-
- if (!acpi_video_backlight_support()) {
- result = eeepc_backlight_init(dev);
- if (result)
- goto fail_backlight;
- } else
- pr_info("Backlight controlled by ACPI video driver\n");
-
- result = eeepc_hwmon_init(dev);
- if (result)
- goto fail_hwmon;
eeepc_enable_camera();
@@ -1093,12 +1081,30 @@ static int __init eeepc_laptop_init(void)
if (result)
goto fail_sysfs;
+ dev = &platform_device->dev;
+
+ if (!acpi_video_backlight_support()) {
+ result = eeepc_backlight_init(dev);
+ if (result)
+ goto fail_backlight;
+ } else
+ pr_info("Backlight controlled by ACPI video "
+ "driver\n");
+
+ result = eeepc_hwmon_init(dev);
+ if (result)
+ goto fail_hwmon;
+
result = eeepc_rfkill_init(dev);
if (result)
goto fail_rfkill;
return 0;
fail_rfkill:
+ eeepc_hwmon_exit();
+fail_hwmon:
+ eeepc_backlight_exit();
+fail_backlight:
sysfs_remove_group(&platform_device->dev.kobj,
&platform_attribute_group);
fail_sysfs:
@@ -1108,10 +1114,6 @@ fail_platform_device2:
fail_platform_device1:
platform_driver_unregister(&platform_driver);
fail_platform_driver:
- eeepc_hwmon_exit();
-fail_hwmon:
- eeepc_backlight_exit();
-fail_backlight:
eeepc_input_exit();
return result;
}
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 11/15] eeepc-laptop: sync eeepc-laptop with asus_acpi
2009-06-16 19:28 ` [PATCH 10/15] eeepc-laptop: right parent device Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 12/15] eeepc-laptop: makes get_acpi() returns -ENODEV Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
In the default Eee PC distribution, there is a modified
asus_acpi driver. eeepc-laptop is a cleaned version of this
driver. Sync ASL enum and getter/setters with asus_acpi.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 7121239..8ef9f74 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -60,7 +60,10 @@ enum {
DISABLE_ASL_GPS = 0x0020,
DISABLE_ASL_DISPLAYSWITCH = 0x0040,
DISABLE_ASL_MODEM = 0x0080,
- DISABLE_ASL_CARDREADER = 0x0100
+ DISABLE_ASL_CARDREADER = 0x0100,
+ DISABLE_ASL_3G = 0x0200,
+ DISABLE_ASL_WIMAX = 0x0400,
+ DISABLE_ASL_HWCF = 0x0800
};
enum {
@@ -85,7 +88,13 @@ enum {
CM_ASL_USBPORT3,
CM_ASL_MODEM,
CM_ASL_CARDREADER,
- CM_ASL_LID
+ CM_ASL_3G,
+ CM_ASL_WIMAX,
+ CM_ASL_HWCF,
+ CM_ASL_LID,
+ CM_ASL_TYPE,
+ CM_ASL_PANELPOWER, /*P901*/
+ CM_ASL_TPD
};
static const char *cm_getv[] = {
@@ -94,7 +103,8 @@ static const char *cm_getv[] = {
NULL, "PBLG", NULL, NULL,
"CFVG", NULL, NULL, NULL,
"USBG", NULL, NULL, "MODG",
- "CRDG", "LIDG"
+ "CRDG", "M3GG", "WIMG", "HWCF",
+ "LIDG", "TYPE", "PBPG", "TPDG"
};
static const char *cm_setv[] = {
@@ -103,7 +113,8 @@ static const char *cm_setv[] = {
"SDSP", "PBLS", "HDPS", NULL,
"CFVS", NULL, NULL, NULL,
"USBG", NULL, NULL, "MODS",
- "CRDS", NULL
+ "CRDS", "M3GS", "WIMS", NULL,
+ NULL, NULL, "PBPS", "TPDS"
};
#define EEEPC_EC "\\_SB.PCI0.SBRG.EC0."
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 12/15] eeepc-laptop: makes get_acpi() returns -ENODEV
2009-06-16 19:28 ` [PATCH 11/15] eeepc-laptop: sync eeepc-laptop with asus_acpi Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 13/15] eeepc-laptop: get the right value for CMSG Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
If there is there is no getter defined, get_acpi()
will return -ENODEV.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 8ef9f74..d466139 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -284,7 +284,7 @@ static int set_acpi(int cm, int value)
static int get_acpi(int cm)
{
- int value = -1;
+ int value = -ENODEV;
if ((ehotk->cm_supported & (0x1 << cm))) {
const char *method = cm_getv[cm];
if (method == NULL)
@@ -379,13 +379,19 @@ static ssize_t store_sys_acpi(int cm, const char *buf, size_t count)
rv = parse_arg(buf, count, &value);
if (rv > 0)
- set_acpi(cm, value);
+ value = set_acpi(cm, value);
+ if (value < 0)
+ return value;
return rv;
}
static ssize_t show_sys_acpi(int cm, char *buf)
{
- return sprintf(buf, "%d\n", get_acpi(cm));
+ int value = get_acpi(cm);
+
+ if (value < 0)
+ return value;
+ return sprintf(buf, "%d\n", value);
}
#define EEEPC_CREATE_DEVICE_ATTR(_name, _cm) \
@@ -954,8 +960,9 @@ static int eeepc_new_rfkill(struct rfkill **rfkill,
{
int result;
- if (get_acpi(cm) == -1)
- return -ENODEV;
+ result = get_acpi(cm);
+ if (result < 0)
+ return result;
*rfkill = rfkill_allocate(dev, type);
if (!*rfkill)
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 13/15] eeepc-laptop: get the right value for CMSG
2009-06-16 19:28 ` [PATCH 12/15] eeepc-laptop: makes get_acpi() returns -ENODEV Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 14/15] eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
CMSG is an ACPI method used to find features available on
an Eee PC. But some features are never repported, even if present.
If the getter of a feature is present, this patch will set
the corresponding bit in cmsg.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index d466139..789710a 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -490,6 +490,28 @@ static int eeepc_setkeycode(struct input_dev *dev, int scancode, int keycode)
return -EINVAL;
}
+static void cmsg_quirk(int cm, const char *name)
+{
+ int dummy;
+
+ /* Some BIOSes do not report cm although it is avaliable.
+ Check if cm_getv[cm] works and, if yes, assume cm should be set. */
+ if (!(ehotk->cm_supported & (1 << cm))
+ && !read_acpi_int(ehotk->handle, cm_getv[cm], &dummy)) {
+ pr_info("%s (%x) not reported by BIOS,"
+ " enabling anyway\n", name, 1 << cm);
+ ehotk->cm_supported |= 1 << cm;
+ }
+}
+
+static void cmsg_quirks(void)
+{
+ cmsg_quirk(CM_ASL_LID, "LID");
+ cmsg_quirk(CM_ASL_TYPE, "TYPE");
+ cmsg_quirk(CM_ASL_PANELPOWER, "PANELPOWER");
+ cmsg_quirk(CM_ASL_TPD, "TPD");
+}
+
static int eeepc_hotk_check(void)
{
const struct key_entry *key;
@@ -513,6 +535,7 @@ static int eeepc_hotk_check(void)
pr_err("Get control methods supported failed\n");
return -ENODEV;
} else {
+ cmsg_quirks();
pr_info("Get control methods supported: 0x%x\n",
ehotk->cm_supported);
}
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 14/15] eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go
2009-06-16 19:28 ` [PATCH 13/15] eeepc-laptop: get the right value for CMSG Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
2009-06-16 19:28 ` [PATCH 15/15] eeepc-laptop: cpufv updates Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 789710a..deb103c 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -141,6 +141,7 @@ struct eeepc_hotk {
u16 *keycode_map;
struct rfkill *wlan_rfkill;
struct rfkill *bluetooth_rfkill;
+ struct rfkill *wwan3g_rfkill;
struct hotplug_slot *hotplug_slot;
};
@@ -352,6 +353,23 @@ static int eeepc_bluetooth_rfkill_state(void *data, enum rfkill_state *state)
return 0;
}
+static int eeepc_wwan3g_rfkill_set(void *data, enum rfkill_state state)
+{
+ if (state == RFKILL_STATE_SOFT_BLOCKED)
+ return set_acpi(CM_ASL_3G, 0);
+ else
+ return set_acpi(CM_ASL_3G, 1);
+}
+
+static int eeepc_wwan3g_rfkill_state(void *data, enum rfkill_state *state)
+{
+ if (get_acpi(CM_ASL_3G) == 1)
+ *state = RFKILL_STATE_UNBLOCKED;
+ else
+ *state = RFKILL_STATE_SOFT_BLOCKED;
+ return 0;
+}
+
static void __init eeepc_enable_camera(void)
{
/*
@@ -939,6 +957,8 @@ static void eeepc_rfkill_exit(void)
rfkill_unregister(ehotk->wlan_rfkill);
if (ehotk->bluetooth_rfkill)
rfkill_unregister(ehotk->bluetooth_rfkill);
+ if (ehotk->wwan3g_rfkill)
+ rfkill_unregister(ehotk->wwan3g_rfkill);
if (ehotk->hotplug_slot)
pci_hp_deregister(ehotk->hotplug_slot);
}
@@ -1036,6 +1056,15 @@ static int eeepc_rfkill_init(struct device *dev)
if (result && result != -ENODEV)
goto exit;
+ result = eeepc_new_rfkill(&ehotk->wwan3g_rfkill,
+ "eeepc-wwan3g", dev,
+ RFKILL_TYPE_WWAN, CM_ASL_3G,
+ eeepc_wwan3g_rfkill_set,
+ eeepc_wwan3g_rfkill_state);
+
+ if (result && result != -ENODEV)
+ goto exit;
+
result = eeepc_setup_pci_hotplug();
/*
* If we get -EBUSY then something else is handling the PCI hotplug -
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 15/15] eeepc-laptop: cpufv updates
2009-06-16 19:28 ` [PATCH 14/15] eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go Corentin Chary
@ 2009-06-16 19:28 ` Corentin Chary
0 siblings, 0 replies; 40+ messages in thread
From: Corentin Chary @ 2009-06-16 19:28 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Limit cpufv input to acceptables values.
Add an available_cpufv file to show available
presets.
Change cpufv ouput format from %d to %#x, it won't
break compatibility with existing userspace tools, but
it provide a more human readable output.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 77 ++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 1 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index deb103c..86f9f80 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -436,13 +436,88 @@ static ssize_t show_sys_acpi(int cm, char *buf)
EEEPC_CREATE_DEVICE_ATTR(camera, CM_ASL_CAMERA);
EEEPC_CREATE_DEVICE_ATTR(cardr, CM_ASL_CARDREADER);
EEEPC_CREATE_DEVICE_ATTR(disp, CM_ASL_DISPLAYSWITCH);
-EEEPC_CREATE_DEVICE_ATTR(cpufv, CM_ASL_CPUFV);
+
+struct eeepc_cpufv {
+ int num;
+ int cur;
+};
+
+static int get_cpufv(struct eeepc_cpufv *c)
+{
+ c->cur = get_acpi(CM_ASL_CPUFV);
+ c->num = (c->cur >> 8) & 0xff;
+ c->cur &= 0xff;
+ if (c->cur < 0 || c->num <= 0 || c->num > 12)
+ return -ENODEV;
+ return 0;
+}
+
+static ssize_t show_available_cpufv(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct eeepc_cpufv c;
+ int i;
+ ssize_t len = 0;
+
+ if (get_cpufv(&c))
+ return -ENODEV;
+ for (i = 0; i < c.num; i++)
+ len += sprintf(buf + len, "%d ", i);
+ len += sprintf(buf + len, "\n");
+ return len;
+}
+
+static ssize_t show_cpufv(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct eeepc_cpufv c;
+
+ if (get_cpufv(&c))
+ return -ENODEV;
+ return sprintf(buf, "%#x\n", (c.num << 8) | c.cur);
+}
+
+static ssize_t store_cpufv(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct eeepc_cpufv c;
+ int rv, value;
+
+ if (get_cpufv(&c))
+ return -ENODEV;
+ rv = parse_arg(buf, count, &value);
+ if (rv < 0)
+ return rv;
+ if (!rv || value < 0 || value >= c.num)
+ return -EINVAL;
+ set_acpi(CM_ASL_CPUFV, value);
+ return rv;
+}
+
+static struct device_attribute dev_attr_cpufv = {
+ .attr = {
+ .name = "cpufv",
+ .mode = 0644 },
+ .show = show_cpufv,
+ .store = store_cpufv
+};
+
+static struct device_attribute dev_attr_available_cpufv = {
+ .attr = {
+ .name = "available_cpufv",
+ .mode = 0444 },
+ .show = show_available_cpufv
+};
static struct attribute *platform_attributes[] = {
&dev_attr_camera.attr,
&dev_attr_cardr.attr,
&dev_attr_disp.attr,
&dev_attr_cpufv.attr,
+ &dev_attr_available_cpufv.attr,
NULL
};
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH 00/15] acpi4asus updates
2009-06-16 19:28 [PATCH 00/15] acpi4asus updates Corentin Chary
2009-06-16 19:28 ` [PATCH 01/15] eeepc-laptop: Register as a pci-hotplug device Corentin Chary
@ 2009-06-18 2:41 ` Len Brown
2009-06-18 6:21 ` Len Brown
1 sibling, 1 reply; 40+ messages in thread
From: Len Brown @ 2009-06-18 2:41 UTC (permalink / raw)
To: Corentin Chary; +Cc: linux-acpi
applied
thanks,
Len Brown, Intel Open Source Technology Center
On Tue, 16 Jun 2009, Corentin Chary wrote:
> Hi Len,
> It's mainly new features for eeepc-laptop and bugfix.
>
> There is also some change for asus-laptop, which is no
> longer marked as EXPERIMENTAL, when asus_acpi is now
> DEPRECATED.
>
> You can directly pull from the git tree if you want
> git://git.iksaif.net/acpi4asus.git for-next
>
> Thanks
>
> Corentin Chary (11):
> asus-laptop: platform dev as parent for led and backlight
> acpi4asus: update MAINTAINER and KConfig links
> asus_acpi: Deprecate in favor of asus-laptop
> asus-laptop: use pr_fmt and pr_<level>
> eeepc-laptop: rfkill refactoring
> eeepc-laptop: right parent device
> eeepc-laptop: sync eeepc-laptop with asus_acpi
> eeepc-laptop: makes get_acpi() returns -ENODEV
> eeepc-laptop: get the right value for CMSG
> eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go
> eeepc-laptop: cpufv updates
>
> Joe Perches (1):
> eeepc-laptop.c: use pr_fmt and pr_<level>
>
> Matthew Garrett (1):
> eeepc-laptop: Register as a pci-hotplug device
>
> Pekka Enberg (1):
> eeepc-laptop: enable camera by default
>
> Randy Dunlap (1):
> eeepc: fix kconfig selects
>
> MAINTAINERS | 8 +-
> drivers/platform/x86/Kconfig | 17 +-
> drivers/platform/x86/asus-laptop.c | 92 ++++----
> drivers/platform/x86/eeepc-laptop.c | 502 +++++++++++++++++++++++++----------
> 4 files changed, 428 insertions(+), 191 deletions(-)
>
> --
> 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
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 00/15] acpi4asus updates
2009-06-18 2:41 ` [PATCH 00/15] acpi4asus updates Len Brown
@ 2009-06-18 6:21 ` Len Brown
2009-06-19 8:28 ` Corentin Chary
2009-06-19 12:52 ` [PATCH 1/9] asus-laptop: use pr_fmt and pr_<level> Corentin Chary
0 siblings, 2 replies; 40+ messages in thread
From: Len Brown @ 2009-06-18 6:21 UTC (permalink / raw)
To: Corentin Chary; +Cc: linux-acpi
> applied
This series was okay in my 2.6.30-based test tree -- modulo
a simple conflict with Bjorn's .notify patch. But there are more
conflicts when merged up w/ Linus in preparation for a push
due to the rfkill changes that are upstream:-(
I got lost trying to merge that branch on top of Linus's tree --
git merges do all the branch conflicts at once rather than
patch-by-patch, so I quickly lost track of which line was
from which patch.
So I abandoned the 2.6.30-based asus branch in my test tree
and instead created a new asus branch on top of my release
tree, which contains Linus' latest, bjorn's .notifiy series;
and I simply took the (6) patches in the series that applied
cleanly and skipped the ones that did not.
Corentin,
If you can refresh the skipped patches below (or simply the whole series)
so it applies on top of my test or release trees, that would be great.
thanks,
-Len
Subject: [01/15] eeepc-laptop: Register as a pci-hotplug device
skipped
Subject: [02/15] eeepc: fix kconfig selects
skipped
Subject: [03/15] eeepc-laptop.c: use pr_fmt and pr_<level>
skipped
Subject: [04/15] eeepc-laptop: enable camera by default
applied
Subject: [05/15] asus-laptop: platform dev as parent for led and backlight
applied
Subject: [06/15] acpi4asus: update MAINTAINER and KConfig links
applied
Subject: [07/15] asus_acpi: Deprecate in favor of asus-laptop
applied
Subject: [08/15] asus-laptop: use pr_fmt and pr_<level>
skipped
Subject: [09/15] eeepc-laptop: rfkill refactoring
skipped
Subject: [10/15] eeepc-laptop: right parent device
skipped
Subject: [11/15] eeepc-laptop: sync eeepc-laptop with asus_acpi
applied
Subject: [12/15] eeepc-laptop: makes get_acpi() returns -ENODEV
skipped
Subject: [13/15] eeepc-laptop: get the right value for CMSG
skipped
Subject: [14/15] eeepc-laptop: add rfkill support for the 3G modem in Eee PC
skipped
Subject: [15/15] eeepc-laptop: cpufv updates
applied.
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 00/15] acpi4asus updates
2009-06-18 6:21 ` Len Brown
@ 2009-06-19 8:28 ` Corentin Chary
2009-06-19 19:39 ` Len Brown
2009-06-19 12:52 ` [PATCH 1/9] asus-laptop: use pr_fmt and pr_<level> Corentin Chary
1 sibling, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-19 8:28 UTC (permalink / raw)
To: Len Brown; +Cc: linux-acpi
On Thu, Jun 18, 2009 at 8:21 AM, Len Brown<lenb@kernel.org> wrote:
>> applied
>
> This series was okay in my 2.6.30-based test tree -- modulo
> a simple conflict with Bjorn's .notify patch. But there are more
> conflicts when merged up w/ Linus in preparation for a push
> due to the rfkill changes that are upstream:-(
>
> I got lost trying to merge that branch on top of Linus's tree --
> git merges do all the branch conflicts at once rather than
> patch-by-patch, so I quickly lost track of which line was
> from which patch.
>
> So I abandoned the 2.6.30-based asus branch in my test tree
> and instead created a new asus branch on top of my release
> tree, which contains Linus' latest, bjorn's .notifiy series;
> and I simply took the (6) patches in the series that applied
> cleanly and skipped the ones that did not.
>
> Corentin,
> If you can refresh the skipped patches below (or simply the whole series)
> so it applies on top of my test or release trees, that would be great.
>
> thanks,
> -Len
>
>
> Subject: [01/15] eeepc-laptop: Register as a pci-hotplug device
>
> skipped
>
> Subject: [02/15] eeepc: fix kconfig selects
>
> skipped
>
> Subject: [03/15] eeepc-laptop.c: use pr_fmt and pr_<level>
>
> skipped
>
> Subject: [04/15] eeepc-laptop: enable camera by default
>
> applied
>
> Subject: [05/15] asus-laptop: platform dev as parent for led and backlight
>
> applied
>
> Subject: [06/15] acpi4asus: update MAINTAINER and KConfig links
>
> applied
>
> Subject: [07/15] asus_acpi: Deprecate in favor of asus-laptop
>
> applied
>
> Subject: [08/15] asus-laptop: use pr_fmt and pr_<level>
>
> skipped
>
> Subject: [09/15] eeepc-laptop: rfkill refactoring
>
> skipped
>
> Subject: [10/15] eeepc-laptop: right parent device
>
> skipped
>
> Subject: [11/15] eeepc-laptop: sync eeepc-laptop with asus_acpi
>
> applied
>
> Subject: [12/15] eeepc-laptop: makes get_acpi() returns -ENODEV
>
> skipped
>
> Subject: [13/15] eeepc-laptop: get the right value for CMSG
>
> skipped
>
> Subject: [14/15] eeepc-laptop: add rfkill support for the 3G modem in Eee PC
>
> skipped
>
> Subject: [15/15] eeepc-laptop: cpufv updates
>
> applied.
>
>
> --
> 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
>
Hi,
Working on it, will send fixed patches soon.
--
Corentin Chary
http://xf.iksaif.net - http://uffs.org
--
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
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 1/9] asus-laptop: use pr_fmt and pr_<level>
2009-06-18 6:21 ` Len Brown
2009-06-19 8:28 ` Corentin Chary
@ 2009-06-19 12:52 ` Corentin Chary
2009-06-19 12:52 ` [PATCH 2/9] eeepc-laptop: Register as a pci-hotplug device Corentin Chary
1 sibling, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-19 12:52 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Convert the unusual printk(ASUS_<level> uses to
the more standard pr_fmt and pr_<level>(.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/asus-laptop.c | 50 ++++++++++++++++++-----------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index faa87d3..db657bb 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -33,6 +33,8 @@
* Sam Lin - GPS support
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -53,9 +55,10 @@
#define ASUS_HOTK_NAME "Asus Laptop Support"
#define ASUS_HOTK_CLASS "hotkey"
#define ASUS_HOTK_DEVICE_NAME "Hotkey"
-#define ASUS_HOTK_FILE "asus-laptop"
+#define ASUS_HOTK_FILE KBUILD_MODNAME
#define ASUS_HOTK_PREFIX "\\_SB.ATKD."
+
/*
* Some events we use, same for all Asus
*/
@@ -327,7 +330,7 @@ static int read_wireless_status(int mask)
rv = acpi_evaluate_integer(wireless_status_handle, NULL, NULL, &status);
if (ACPI_FAILURE(rv))
- printk(ASUS_WARNING "Error reading Wireless status\n");
+ pr_warning("Error reading Wireless status\n");
else
return (status & mask) ? 1 : 0;
@@ -341,7 +344,7 @@ static int read_gps_status(void)
rv = acpi_evaluate_integer(gps_status_handle, NULL, NULL, &status);
if (ACPI_FAILURE(rv))
- printk(ASUS_WARNING "Error reading GPS status\n");
+ pr_warning("Error reading GPS status\n");
else
return status ? 1 : 0;
@@ -381,7 +384,7 @@ static void write_status(acpi_handle handle, int out, int mask)
}
if (write_acpi_int(handle, NULL, out, NULL))
- printk(ASUS_WARNING " write failed %x\n", mask);
+ pr_warning(" write failed %x\n", mask);
}
/* /sys/class/led handlers */
@@ -424,7 +427,7 @@ static int set_lcd_state(int value)
NULL, NULL, NULL);
if (ACPI_FAILURE(status))
- printk(ASUS_WARNING "Error switching LCD\n");
+ pr_warning("Error switching LCD\n");
}
write_status(NULL, lcd, LCD_ON);
@@ -448,7 +451,7 @@ static int read_brightness(struct backlight_device *bd)
rv = acpi_evaluate_integer(brightness_get_handle, NULL, NULL, &value);
if (ACPI_FAILURE(rv))
- printk(ASUS_WARNING "Error reading brightness\n");
+ pr_warning("Error reading brightness\n");
return value;
}
@@ -461,7 +464,7 @@ static int set_brightness(struct backlight_device *bd, int value)
/* 0 <= value <= 15 */
if (write_acpi_int(brightness_set_handle, NULL, value, NULL)) {
- printk(ASUS_WARNING "Error changing brightness\n");
+ pr_warning("Error changing brightness\n");
ret = -EIO;
}
@@ -591,7 +594,7 @@ static ssize_t store_ledd(struct device *dev, struct device_attribute *attr,
rv = parse_arg(buf, count, &value);
if (rv > 0) {
if (write_acpi_int(ledd_set_handle, NULL, value, NULL))
- printk(ASUS_WARNING "LED display write failed\n");
+ pr_warning("LED display write failed\n");
else
hotk->ledd_status = (u32) value;
}
@@ -636,7 +639,7 @@ static void set_display(int value)
{
/* no sanity check needed for now */
if (write_acpi_int(display_set_handle, NULL, value, NULL))
- printk(ASUS_WARNING "Error setting display\n");
+ pr_warning("Error setting display\n");
return;
}
@@ -651,7 +654,7 @@ static int read_display(void)
rv = acpi_evaluate_integer(display_get_handle, NULL,
NULL, &value);
if (ACPI_FAILURE(rv))
- printk(ASUS_WARNING "Error reading display status\n");
+ pr_warning("Error reading display status\n");
}
value &= 0x0F; /* needed for some models, shouldn't hurt others */
@@ -693,7 +696,7 @@ static ssize_t store_disp(struct device *dev, struct device_attribute *attr,
static void set_light_sens_switch(int value)
{
if (write_acpi_int(ls_switch_handle, NULL, value, NULL))
- printk(ASUS_WARNING "Error setting light sensor switch\n");
+ pr_warning("Error setting light sensor switch\n");
hotk->light_switch = value;
}
@@ -718,7 +721,7 @@ static ssize_t store_lssw(struct device *dev, struct device_attribute *attr,
static void set_light_sens_level(int value)
{
if (write_acpi_int(ls_level_handle, NULL, value, NULL))
- printk(ASUS_WARNING "Error setting light sensor level\n");
+ pr_warning("Error setting light sensor level\n");
hotk->light_level = value;
}
@@ -979,11 +982,11 @@ static int asus_hotk_get_info(void)
*/
status = acpi_get_table(ACPI_SIG_DSDT, 1, &asus_info);
if (ACPI_FAILURE(status))
- printk(ASUS_WARNING "Couldn't get the DSDT table header\n");
+ pr_warning("Couldn't get the DSDT table header\n");
/* We have to write 0 on init this far for all ASUS models */
if (write_acpi_int(hotk->handle, "INIT", 0, &buffer)) {
- printk(ASUS_ERR "Hotkey initialization failed\n");
+ pr_err("Hotkey initialization failed\n");
return -ENODEV;
}
@@ -991,9 +994,9 @@ static int asus_hotk_get_info(void)
status =
acpi_evaluate_integer(hotk->handle, "BSTS", NULL, &bsts_result);
if (ACPI_FAILURE(status))
- printk(ASUS_WARNING "Error calling BSTS\n");
+ pr_warning("Error calling BSTS\n");
else if (bsts_result)
- printk(ASUS_NOTICE "BSTS called, 0x%02x returned\n",
+ pr_notice("BSTS called, 0x%02x returned\n",
(uint) bsts_result);
/* This too ... */
@@ -1024,7 +1027,7 @@ static int asus_hotk_get_info(void)
return -ENOMEM;
if (*string)
- printk(ASUS_NOTICE " %s model detected\n", string);
+ pr_notice(" %s model detected\n", string);
ASUS_HANDLE_INIT(mled_set);
ASUS_HANDLE_INIT(tled_set);
@@ -1081,7 +1084,7 @@ static int asus_input_init(void)
hotk->inputdev = input_allocate_device();
if (!hotk->inputdev) {
- printk(ASUS_INFO "Unable to allocate input device\n");
+ pr_info("Unable to allocate input device\n");
return 0;
}
hotk->inputdev->name = "Asus Laptop extra buttons";
@@ -1100,7 +1103,7 @@ static int asus_input_init(void)
}
result = input_register_device(hotk->inputdev);
if (result) {
- printk(ASUS_INFO "Unable to register input device\n");
+ pr_info("Unable to register input device\n");
input_free_device(hotk->inputdev);
}
return result;
@@ -1117,7 +1120,7 @@ static int asus_hotk_check(void)
if (hotk->device->status.present) {
result = asus_hotk_get_info();
} else {
- printk(ASUS_ERR "Hotkey device not present, aborting\n");
+ pr_err("Hotkey device not present, aborting\n");
return -EINVAL;
}
@@ -1133,7 +1136,7 @@ static int asus_hotk_add(struct acpi_device *device)
if (!device)
return -EINVAL;
- printk(ASUS_NOTICE "Asus Laptop Support version %s\n",
+ pr_notice("Asus Laptop Support version %s\n",
ASUS_LAPTOP_VERSION);
hotk = kzalloc(sizeof(struct asus_hotk), GFP_KERNEL);
@@ -1247,8 +1250,7 @@ static int asus_backlight_init(struct device *dev)
bd = backlight_device_register(ASUS_HOTK_FILE, dev,
NULL, &asusbl_ops);
if (IS_ERR(bd)) {
- printk(ASUS_ERR
- "Could not register asus backlight device\n");
+ pr_err("Could not register asus backlight device\n");
asus_backlight_device = NULL;
return PTR_ERR(bd);
}
@@ -1375,7 +1377,7 @@ static int __init asus_laptop_init(void)
if (result)
goto fail_backlight;
} else
- printk(ASUS_INFO "Brightness ignored, must be controlled by "
+ pr_info("Brightness ignored, must be controlled by "
"ACPI video driver\n");
return 0;
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 2/9] eeepc-laptop: Register as a pci-hotplug device
2009-06-19 12:52 ` [PATCH 1/9] asus-laptop: use pr_fmt and pr_<level> Corentin Chary
@ 2009-06-19 12:52 ` Corentin Chary
2009-06-19 12:52 ` [PATCH 3/9] eeepc-laptop.c: use pr_fmt and pr_<level> Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-19 12:52 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary, Matthew Garrett, Len Brown, Randy Dunlap
The eee contains a logically (but not physically) hotpluggable PCIe slot.
Currently this is handled by adding or removing the PCI device in response
to rfkill events, but if a user has forced pciehp to bind to it (with the
force=1 argument) then both drivers will try to handle the event and
hilarity (in the form of oopses) will ensue. This can be avoided by having
eee-laptop register the slot as a hotplug slot. Only one of pciehp and
eee-laptop will successfully register this, avoiding the problem.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Tested-by: Darren Salt <linux@youmustbejoking.demon.co.uk>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/platform/x86/Kconfig | 2 +
drivers/platform/x86/eeepc-laptop.c | 87 +++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 2923cb0..8212e86 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -340,6 +340,8 @@ config EEEPC_LAPTOP
depends on RFKILL || RFKILL = n
select BACKLIGHT_CLASS_DEVICE
select HWMON
+ select HOTPLUG
+ select HOTPLUG_PCI if PCI
---help---
This driver supports the Fn-Fx keys on Eee PC laptops.
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 220e4be..870fd1e 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -31,6 +31,7 @@
#include <linux/input.h>
#include <linux/rfkill.h>
#include <linux/pci.h>
+#include <linux/pci_hotplug.h>
#define EEEPC_LAPTOP_VERSION "0.1"
@@ -143,6 +144,7 @@ struct eeepc_hotk {
u16 *keycode_map;
struct rfkill *eeepc_wlan_rfkill;
struct rfkill *eeepc_bluetooth_rfkill;
+ struct hotplug_slot *hotplug_slot;
};
/* The actual device the driver binds to */
@@ -211,6 +213,15 @@ static struct acpi_driver eeepc_hotk_driver = {
},
};
+/* PCI hotplug ops */
+static int eeepc_get_adapter_status(struct hotplug_slot *slot, u8 *value);
+
+static struct hotplug_slot_ops eeepc_hotplug_slot_ops = {
+ .owner = THIS_MODULE,
+ .get_adapter_status = eeepc_get_adapter_status,
+ .get_power_status = eeepc_get_adapter_status,
+};
+
/* The backlight device /sys/class/backlight */
static struct backlight_device *eeepc_backlight_device;
@@ -610,6 +621,19 @@ static int notify_brn(void)
return -1;
}
+static int eeepc_get_adapter_status(struct hotplug_slot *hotplug_slot,
+ u8 *value)
+{
+ int val = get_acpi(CM_ASL_WLAN);
+
+ if (val == 1 || val == 0)
+ *value = val;
+ else
+ return -EINVAL;
+
+ return 0;
+}
+
static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
{
struct pci_dev *dev;
@@ -737,6 +761,54 @@ static void eeepc_unregister_rfkill_notifier(char *node)
}
}
+static void eeepc_cleanup_pci_hotplug(struct hotplug_slot *hotplug_slot)
+{
+ kfree(hotplug_slot->info);
+ kfree(hotplug_slot);
+}
+
+static int eeepc_setup_pci_hotplug(void)
+{
+ int ret = -ENOMEM;
+ struct pci_bus *bus = pci_find_bus(0, 1);
+
+ if (!bus) {
+ printk(EEEPC_ERR "Unable to find wifi PCI bus\n");
+ return -ENODEV;
+ }
+
+ ehotk->hotplug_slot = kzalloc(sizeof(struct hotplug_slot), GFP_KERNEL);
+ if (!ehotk->hotplug_slot)
+ goto error_slot;
+
+ ehotk->hotplug_slot->info = kzalloc(sizeof(struct hotplug_slot_info),
+ GFP_KERNEL);
+ if (!ehotk->hotplug_slot->info)
+ goto error_info;
+
+ ehotk->hotplug_slot->private = ehotk;
+ ehotk->hotplug_slot->release = &eeepc_cleanup_pci_hotplug;
+ ehotk->hotplug_slot->ops = &eeepc_hotplug_slot_ops;
+ eeepc_get_adapter_status(ehotk->hotplug_slot,
+ &ehotk->hotplug_slot->info->adapter_status);
+
+ ret = pci_hp_register(ehotk->hotplug_slot, bus, 0, "eeepc-wifi");
+ if (ret) {
+ printk(EEEPC_ERR "Unable to register hotplug slot - %d\n", ret);
+ goto error_register;
+ }
+
+ return 0;
+
+error_register:
+ kfree(ehotk->hotplug_slot->info);
+error_info:
+ kfree(ehotk->hotplug_slot);
+ ehotk->hotplug_slot = NULL;
+error_slot:
+ return ret;
+}
+
static int eeepc_hotk_add(struct acpi_device *device)
{
int result;
@@ -795,8 +867,21 @@ static int eeepc_hotk_add(struct acpi_device *device)
goto bluetooth_fail;
}
+ result = eeepc_setup_pci_hotplug();
+ /*
+ * If we get -EBUSY then something else is handling the PCI hotplug -
+ * don't fail in this case
+ */
+ if (result == -EBUSY)
+ return 0;
+ else if (result)
+ goto pci_fail;
+
return 0;
+ pci_fail:
+ if (ehotk->eeepc_bluetooth_rfkill)
+ rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
bluetooth_fail:
rfkill_destroy(ehotk->eeepc_bluetooth_rfkill);
rfkill_unregister(ehotk->eeepc_wlan_rfkill);
@@ -818,6 +903,8 @@ static int eeepc_hotk_remove(struct acpi_device *device, int type)
eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
+ if (ehotk->hotplug_slot)
+ pci_hp_deregister(ehotk->hotplug_slot);
kfree(ehotk);
return 0;
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 3/9] eeepc-laptop.c: use pr_fmt and pr_<level>
2009-06-19 12:52 ` [PATCH 2/9] eeepc-laptop: Register as a pci-hotplug device Corentin Chary
@ 2009-06-19 12:52 ` Corentin Chary
2009-06-19 12:52 ` [PATCH 4/9] eeepc-laptop: rfkill refactoring Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-19 12:52 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Joe Perches, Corentin Chary
From: Joe Perches <joe@perches.com>
Convert the unusual printk(EEEPC_<level> uses to
the more standard pr_fmt and pr_<level>(.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 55 ++++++++++++++---------------------
1 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 870fd1e..20e264f 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -16,6 +16,8 @@
* GNU General Public License for more details.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -41,11 +43,6 @@
#define EEEPC_HOTK_DEVICE_NAME "Hotkey"
#define EEEPC_HOTK_HID "ASUS010"
-#define EEEPC_LOG EEEPC_HOTK_FILE ": "
-#define EEEPC_ERR KERN_ERR EEEPC_LOG
-#define EEEPC_WARNING KERN_WARNING EEEPC_LOG
-#define EEEPC_NOTICE KERN_NOTICE EEEPC_LOG
-#define EEEPC_INFO KERN_INFO EEEPC_LOG
/*
* Definitions for Asus EeePC
@@ -283,7 +280,7 @@ static int set_acpi(int cm, int value)
if (method == NULL)
return -ENODEV;
if (write_acpi_int(ehotk->handle, method, value, NULL))
- printk(EEEPC_WARNING "Error writing %s\n", method);
+ pr_warning("Error writing %s\n", method);
}
return 0;
}
@@ -296,7 +293,7 @@ static int get_acpi(int cm)
if (method == NULL)
return -ENODEV;
if (read_acpi_int(ehotk->handle, method, &value))
- printk(EEEPC_WARNING "Error reading %s\n", method);
+ pr_warning("Error reading %s\n", method);
}
return value;
}
@@ -560,26 +557,23 @@ static int eeepc_hotk_check(void)
if (ehotk->device->status.present) {
if (write_acpi_int(ehotk->handle, "INIT", ehotk->init_flag,
&buffer)) {
- printk(EEEPC_ERR "Hotkey initialization failed\n");
+ pr_err("Hotkey initialization failed\n");
return -ENODEV;
} else {
- printk(EEEPC_NOTICE "Hotkey init flags 0x%x\n",
- ehotk->init_flag);
+ pr_notice("Hotkey init flags 0x%x\n", ehotk->init_flag);
}
/* get control methods supported */
if (read_acpi_int(ehotk->handle, "CMSG"
, &ehotk->cm_supported)) {
- printk(EEEPC_ERR
- "Get control methods supported failed\n");
+ pr_err("Get control methods supported failed\n");
return -ENODEV;
} else {
- printk(EEEPC_INFO
- "Get control methods supported: 0x%x\n",
- ehotk->cm_supported);
+ pr_info("Get control methods supported: 0x%x\n",
+ ehotk->cm_supported);
}
ehotk->inputdev = input_allocate_device();
if (!ehotk->inputdev) {
- printk(EEEPC_INFO "Unable to allocate input device\n");
+ pr_info("Unable to allocate input device\n");
return 0;
}
ehotk->inputdev->name = "Asus EeePC extra buttons";
@@ -598,12 +592,12 @@ static int eeepc_hotk_check(void)
}
result = input_register_device(ehotk->inputdev);
if (result) {
- printk(EEEPC_INFO "Unable to register input device\n");
+ pr_info("Unable to register input device\n");
input_free_device(ehotk->inputdev);
return 0;
}
} else {
- printk(EEEPC_ERR "Hotkey device not present, aborting\n");
+ pr_err("Hotkey device not present, aborting\n");
return -EINVAL;
}
return 0;
@@ -644,7 +638,7 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
return;
if (!bus) {
- printk(EEEPC_WARNING "Unable to find PCI bus 1?\n");
+ pr_warning("Unable to find PCI bus 1?\n");
return;
}
@@ -660,7 +654,7 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
if (dev) {
pci_bus_assign_resources(bus);
if (pci_bus_add_device(dev))
- printk(EEEPC_ERR "Unable to hotplug wifi\n");
+ pr_err("Unable to hotplug wifi\n");
}
} else {
dev = pci_get_slot(bus, 0);
@@ -735,8 +729,7 @@ static int eeepc_register_rfkill_notifier(char *node)
eeepc_rfkill_notify,
NULL);
if (ACPI_FAILURE(status))
- printk(EEEPC_WARNING
- "Failed to register notify on %s\n", node);
+ pr_warning("Failed to register notify on %s\n", node);
} else
return -ENODEV;
@@ -755,8 +748,7 @@ static void eeepc_unregister_rfkill_notifier(char *node)
ACPI_SYSTEM_NOTIFY,
eeepc_rfkill_notify);
if (ACPI_FAILURE(status))
- printk(EEEPC_ERR
- "Error removing rfkill notify handler %s\n",
+ pr_err("Error removing rfkill notify handler %s\n",
node);
}
}
@@ -773,7 +765,7 @@ static int eeepc_setup_pci_hotplug(void)
struct pci_bus *bus = pci_find_bus(0, 1);
if (!bus) {
- printk(EEEPC_ERR "Unable to find wifi PCI bus\n");
+ pr_err("Unable to find wifi PCI bus\n");
return -ENODEV;
}
@@ -794,7 +786,7 @@ static int eeepc_setup_pci_hotplug(void)
ret = pci_hp_register(ehotk->hotplug_slot, bus, 0, "eeepc-wifi");
if (ret) {
- printk(EEEPC_ERR "Unable to register hotplug slot - %d\n", ret);
+ pr_err("Unable to register hotplug slot - %d\n", ret);
goto error_register;
}
@@ -815,7 +807,7 @@ static int eeepc_hotk_add(struct acpi_device *device)
if (!device)
return -EINVAL;
- printk(EEEPC_NOTICE EEEPC_HOTK_NAME "\n");
+ pr_notice(EEEPC_HOTK_NAME "\n");
ehotk = kzalloc(sizeof(struct eeepc_hotk), GFP_KERNEL);
if (!ehotk)
return -ENOMEM;
@@ -1071,8 +1063,7 @@ static int eeepc_backlight_init(struct device *dev)
bd = backlight_device_register(EEEPC_HOTK_FILE, dev,
NULL, &eeepcbl_ops);
if (IS_ERR(bd)) {
- printk(EEEPC_ERR
- "Could not register eeepc backlight device\n");
+ pr_err("Could not register eeepc backlight device\n");
eeepc_backlight_device = NULL;
return PTR_ERR(bd);
}
@@ -1091,8 +1082,7 @@ static int eeepc_hwmon_init(struct device *dev)
hwmon = hwmon_device_register(dev);
if (IS_ERR(hwmon)) {
- printk(EEEPC_ERR
- "Could not register eeepc hwmon device\n");
+ pr_err("Could not register eeepc hwmon device\n");
eeepc_hwmon_device = NULL;
return PTR_ERR(hwmon);
}
@@ -1125,8 +1115,7 @@ static int __init eeepc_laptop_init(void)
if (result)
goto fail_backlight;
} else
- printk(EEEPC_INFO "Backlight controlled by ACPI video "
- "driver\n");
+ pr_info("Backlight controlled by ACPI video driver\n");
result = eeepc_hwmon_init(dev);
if (result)
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 4/9] eeepc-laptop: rfkill refactoring
2009-06-19 12:52 ` [PATCH 3/9] eeepc-laptop.c: use pr_fmt and pr_<level> Corentin Chary
@ 2009-06-19 12:52 ` Corentin Chary
2009-06-19 12:52 ` [PATCH 5/9] eeepc-laptop: right parent device Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-19 12:52 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Refactor rfkill code, because we'll add another
rfkill for wwan3g later.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 151 ++++++++++++++++++----------------
1 files changed, 80 insertions(+), 71 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 20e264f..b2e8a71 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -139,8 +139,8 @@ struct eeepc_hotk {
u16 event_count[128]; /* count for each event */
struct input_dev *inputdev;
u16 *keycode_map;
- struct rfkill *eeepc_wlan_rfkill;
- struct rfkill *eeepc_bluetooth_rfkill;
+ struct rfkill *wlan_rfkill;
+ struct rfkill *bluetooth_rfkill;
struct hotplug_slot *hotplug_slot;
};
@@ -664,7 +664,7 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
}
}
- rfkill_set_sw_state(ehotk->eeepc_wlan_rfkill, blocked);
+ rfkill_set_sw_state(ehotk->wlan_rfkill, blocked);
}
static void eeepc_hotk_notify(struct acpi_device *device, u32 event)
@@ -821,66 +821,8 @@ static int eeepc_hotk_add(struct acpi_device *device)
if (result)
goto ehotk_fail;
- eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
- eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
-
- if (get_acpi(CM_ASL_WLAN) != -1) {
- ehotk->eeepc_wlan_rfkill = rfkill_alloc("eeepc-wlan",
- &device->dev,
- RFKILL_TYPE_WLAN,
- &eeepc_rfkill_ops,
- (void *)CM_ASL_WLAN);
-
- if (!ehotk->eeepc_wlan_rfkill)
- goto wlan_fail;
-
- rfkill_set_sw_state(ehotk->eeepc_wlan_rfkill,
- get_acpi(CM_ASL_WLAN) != 1);
- result = rfkill_register(ehotk->eeepc_wlan_rfkill);
- if (result)
- goto wlan_fail;
- }
-
- if (get_acpi(CM_ASL_BLUETOOTH) != -1) {
- ehotk->eeepc_bluetooth_rfkill =
- rfkill_alloc("eeepc-bluetooth",
- &device->dev,
- RFKILL_TYPE_BLUETOOTH,
- &eeepc_rfkill_ops,
- (void *)CM_ASL_BLUETOOTH);
-
- if (!ehotk->eeepc_bluetooth_rfkill)
- goto bluetooth_fail;
-
- rfkill_set_sw_state(ehotk->eeepc_bluetooth_rfkill,
- get_acpi(CM_ASL_BLUETOOTH) != 1);
- result = rfkill_register(ehotk->eeepc_bluetooth_rfkill);
- if (result)
- goto bluetooth_fail;
- }
-
- result = eeepc_setup_pci_hotplug();
- /*
- * If we get -EBUSY then something else is handling the PCI hotplug -
- * don't fail in this case
- */
- if (result == -EBUSY)
- return 0;
- else if (result)
- goto pci_fail;
-
return 0;
- pci_fail:
- if (ehotk->eeepc_bluetooth_rfkill)
- rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
- bluetooth_fail:
- rfkill_destroy(ehotk->eeepc_bluetooth_rfkill);
- rfkill_unregister(ehotk->eeepc_wlan_rfkill);
- wlan_fail:
- rfkill_destroy(ehotk->eeepc_wlan_rfkill);
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
ehotk_fail:
kfree(ehotk);
ehotk = NULL;
@@ -893,11 +835,6 @@ static int eeepc_hotk_remove(struct acpi_device *device, int type)
if (!device || !acpi_driver_data(device))
return -EINVAL;
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
- if (ehotk->hotplug_slot)
- pci_hp_deregister(ehotk->hotplug_slot);
-
kfree(ehotk);
return 0;
}
@@ -1018,10 +955,14 @@ static void eeepc_backlight_exit(void)
static void eeepc_rfkill_exit(void)
{
- if (ehotk->eeepc_wlan_rfkill)
- rfkill_unregister(ehotk->eeepc_wlan_rfkill);
- if (ehotk->eeepc_bluetooth_rfkill)
- rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
+ eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
+ eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
+ if (ehotk->wlan_rfkill)
+ rfkill_unregister(ehotk->wlan_rfkill);
+ if (ehotk->bluetooth_rfkill)
+ rfkill_unregister(ehotk->bluetooth_rfkill);
+ if (ehotk->hotplug_slot)
+ pci_hp_deregister(ehotk->hotplug_slot);
}
static void eeepc_input_exit(void)
@@ -1056,6 +997,67 @@ static void __exit eeepc_laptop_exit(void)
platform_driver_unregister(&platform_driver);
}
+static int eeepc_new_rfkill(struct rfkill **rfkill,
+ const char *name, struct device *dev,
+ enum rfkill_type type, int cm)
+{
+ int result;
+
+ if (get_acpi(cm) == -1)
+ return -ENODEV;
+
+ *rfkill = rfkill_alloc(name, dev, type,
+ &eeepc_rfkill_ops, (void *)(unsigned long)cm);
+
+ if (!*rfkill)
+ return -EINVAL;
+
+ rfkill_set_sw_state(*rfkill, get_acpi(cm) != 1);
+ result = rfkill_register(*rfkill);
+ if (result) {
+ rfkill_destroy(*rfkill);
+ *rfkill = NULL;
+ return result;
+ }
+ return 0;
+}
+
+
+static int eeepc_rfkill_init(struct device *dev)
+{
+ int result = 0;
+
+ eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
+ eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
+
+ result = eeepc_new_rfkill(&ehotk->wlan_rfkill,
+ "eeepc-wlan", dev,
+ RFKILL_TYPE_WLAN, CM_ASL_WLAN);
+
+ if (result && result != -ENODEV)
+ goto exit;
+
+ result = eeepc_new_rfkill(&ehotk->bluetooth_rfkill,
+ "eeepc-bluetooth", dev,
+ RFKILL_TYPE_BLUETOOTH, CM_ASL_BLUETOOTH);
+
+ if (result && result != -ENODEV)
+ goto exit;
+
+ result = eeepc_setup_pci_hotplug();
+ /*
+ * If we get -EBUSY then something else is handling the PCI hotplug -
+ * don't fail in this case
+ */
+ if (result == -EBUSY)
+ result = 0;
+
+exit:
+ if (result && result != -ENODEV)
+ eeepc_rfkill_exit();
+ return result;
+}
+
static int eeepc_backlight_init(struct device *dev)
{
struct backlight_device *bd;
@@ -1139,7 +1141,15 @@ static int __init eeepc_laptop_init(void)
&platform_attribute_group);
if (result)
goto fail_sysfs;
+
+ result = eeepc_rfkill_init(dev);
+ if (result)
+ goto fail_rfkill;
+
return 0;
+fail_rfkill:
+ sysfs_remove_group(&platform_device->dev.kobj,
+ &platform_attribute_group);
fail_sysfs:
platform_device_del(platform_device);
fail_platform_device2:
@@ -1152,7 +1162,6 @@ fail_hwmon:
eeepc_backlight_exit();
fail_backlight:
eeepc_input_exit();
- eeepc_rfkill_exit();
return result;
}
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 5/9] eeepc-laptop: right parent device
2009-06-19 12:52 ` [PATCH 4/9] eeepc-laptop: rfkill refactoring Corentin Chary
@ 2009-06-19 12:52 ` Corentin Chary
2009-06-19 12:52 ` [PATCH 6/9] eeepc-laptop: makes get_acpi() returns -ENODEV Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-19 12:52 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index b2e8a71..aad5d16 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -1110,18 +1110,6 @@ static int __init eeepc_laptop_init(void)
acpi_bus_unregister_driver(&eeepc_hotk_driver);
return -ENODEV;
}
- dev = acpi_get_physical_device(ehotk->device->handle);
-
- if (!acpi_video_backlight_support()) {
- result = eeepc_backlight_init(dev);
- if (result)
- goto fail_backlight;
- } else
- pr_info("Backlight controlled by ACPI video driver\n");
-
- result = eeepc_hwmon_init(dev);
- if (result)
- goto fail_hwmon;
eeepc_enable_camera();
@@ -1142,12 +1130,30 @@ static int __init eeepc_laptop_init(void)
if (result)
goto fail_sysfs;
+ dev = &platform_device->dev;
+
+ if (!acpi_video_backlight_support()) {
+ result = eeepc_backlight_init(dev);
+ if (result)
+ goto fail_backlight;
+ } else
+ pr_info("Backlight controlled by ACPI video "
+ "driver\n");
+
+ result = eeepc_hwmon_init(dev);
+ if (result)
+ goto fail_hwmon;
+
result = eeepc_rfkill_init(dev);
if (result)
goto fail_rfkill;
return 0;
fail_rfkill:
+ eeepc_hwmon_exit();
+fail_hwmon:
+ eeepc_backlight_exit();
+fail_backlight:
sysfs_remove_group(&platform_device->dev.kobj,
&platform_attribute_group);
fail_sysfs:
@@ -1157,10 +1163,6 @@ fail_platform_device2:
fail_platform_device1:
platform_driver_unregister(&platform_driver);
fail_platform_driver:
- eeepc_hwmon_exit();
-fail_hwmon:
- eeepc_backlight_exit();
-fail_backlight:
eeepc_input_exit();
return result;
}
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 6/9] eeepc-laptop: makes get_acpi() returns -ENODEV
2009-06-19 12:52 ` [PATCH 5/9] eeepc-laptop: right parent device Corentin Chary
@ 2009-06-19 12:52 ` Corentin Chary
2009-06-19 12:52 ` [PATCH 7/9] eeepc-laptop: get the right value for CMSG Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-19 12:52 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
If there is there is no getter defined, get_acpi()
will return -ENODEV.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index aad5d16..b1998f9 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -287,7 +287,7 @@ static int set_acpi(int cm, int value)
static int get_acpi(int cm)
{
- int value = -1;
+ int value = -ENODEV;
if ((ehotk->cm_supported & (0x1 << cm))) {
const char *method = cm_getv[cm];
if (method == NULL)
@@ -365,13 +365,19 @@ static ssize_t store_sys_acpi(int cm, const char *buf, size_t count)
rv = parse_arg(buf, count, &value);
if (rv > 0)
- set_acpi(cm, value);
+ value = set_acpi(cm, value);
+ if (value < 0)
+ return value;
return rv;
}
static ssize_t show_sys_acpi(int cm, char *buf)
{
- return sprintf(buf, "%d\n", get_acpi(cm));
+ int value = get_acpi(cm);
+
+ if (value < 0)
+ return value;
+ return sprintf(buf, "%d\n", value);
}
#define EEEPC_CREATE_DEVICE_ATTR(_name, _cm) \
@@ -1003,8 +1009,9 @@ static int eeepc_new_rfkill(struct rfkill **rfkill,
{
int result;
- if (get_acpi(cm) == -1)
- return -ENODEV;
+ result = get_acpi(cm);
+ if (result < 0)
+ return result;
*rfkill = rfkill_alloc(name, dev, type,
&eeepc_rfkill_ops, (void *)(unsigned long)cm);
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 7/9] eeepc-laptop: get the right value for CMSG
2009-06-19 12:52 ` [PATCH 6/9] eeepc-laptop: makes get_acpi() returns -ENODEV Corentin Chary
@ 2009-06-19 12:52 ` Corentin Chary
2009-06-19 12:52 ` [PATCH 8/9] eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-19 12:52 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
CMSG is an ACPI method used to find features available on
an Eee PC. But some features are never repported, even if present.
If the getter of a feature is present, this patch will set
the corresponding bit in cmsg.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index b1998f9..4d55c17 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -551,6 +551,28 @@ static int eeepc_setkeycode(struct input_dev *dev, int scancode, int keycode)
return -EINVAL;
}
+static void cmsg_quirk(int cm, const char *name)
+{
+ int dummy;
+
+ /* Some BIOSes do not report cm although it is avaliable.
+ Check if cm_getv[cm] works and, if yes, assume cm should be set. */
+ if (!(ehotk->cm_supported & (1 << cm))
+ && !read_acpi_int(ehotk->handle, cm_getv[cm], &dummy)) {
+ pr_info("%s (%x) not reported by BIOS,"
+ " enabling anyway\n", name, 1 << cm);
+ ehotk->cm_supported |= 1 << cm;
+ }
+}
+
+static void cmsg_quirks(void)
+{
+ cmsg_quirk(CM_ASL_LID, "LID");
+ cmsg_quirk(CM_ASL_TYPE, "TYPE");
+ cmsg_quirk(CM_ASL_PANELPOWER, "PANELPOWER");
+ cmsg_quirk(CM_ASL_TPD, "TPD");
+}
+
static int eeepc_hotk_check(void)
{
const struct key_entry *key;
@@ -574,6 +596,7 @@ static int eeepc_hotk_check(void)
pr_err("Get control methods supported failed\n");
return -ENODEV;
} else {
+ cmsg_quirks();
pr_info("Get control methods supported: 0x%x\n",
ehotk->cm_supported);
}
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 8/9] eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go
2009-06-19 12:52 ` [PATCH 7/9] eeepc-laptop: get the right value for CMSG Corentin Chary
@ 2009-06-19 12:52 ` Corentin Chary
2009-06-19 12:52 ` [PATCH 9/9] asus-laptop: remove EXPERIMENTAL dependency Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-19 12:52 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary, Janne Grunau
Signed-off-by: Janne Grunau <j@jannau.net>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 4d55c17..67ad360 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -141,6 +141,7 @@ struct eeepc_hotk {
u16 *keycode_map;
struct rfkill *wlan_rfkill;
struct rfkill *bluetooth_rfkill;
+ struct rfkill *wwan3g_rfkill;
struct hotplug_slot *hotplug_slot;
};
@@ -990,6 +991,8 @@ static void eeepc_rfkill_exit(void)
rfkill_unregister(ehotk->wlan_rfkill);
if (ehotk->bluetooth_rfkill)
rfkill_unregister(ehotk->bluetooth_rfkill);
+ if (ehotk->wwan3g_rfkill)
+ rfkill_unregister(ehotk->wwan3g_rfkill);
if (ehotk->hotplug_slot)
pci_hp_deregister(ehotk->hotplug_slot);
}
@@ -1074,6 +1077,13 @@ static int eeepc_rfkill_init(struct device *dev)
if (result && result != -ENODEV)
goto exit;
+ result = eeepc_new_rfkill(&ehotk->wwan3g_rfkill,
+ "eeepc-wwan3g", dev,
+ RFKILL_TYPE_WWAN, CM_ASL_3G);
+
+ if (result && result != -ENODEV)
+ goto exit;
+
result = eeepc_setup_pci_hotplug();
/*
* If we get -EBUSY then something else is handling the PCI hotplug -
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 9/9] asus-laptop: remove EXPERIMENTAL dependency
2009-06-19 12:52 ` [PATCH 8/9] eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go Corentin Chary
@ 2009-06-19 12:52 ` Corentin Chary
0 siblings, 0 replies; 40+ messages in thread
From: Corentin Chary @ 2009-06-19 12:52 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 2923cb0..a440394 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -37,7 +37,7 @@ config ACER_WMI
config ASUS_LAPTOP
tristate "Asus Laptop Extras"
depends on ACPI
- depends on EXPERIMENTAL && !ACPI_ASUS
+ depends on !ACPI_ASUS
select LEDS_CLASS
select NEW_LEDS
select BACKLIGHT_CLASS_DEVICE
--
1.6.3.1
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH 00/15] acpi4asus updates
2009-06-19 8:28 ` Corentin Chary
@ 2009-06-19 19:39 ` Len Brown
2009-06-24 5:41 ` Len Brown
0 siblings, 1 reply; 40+ messages in thread
From: Len Brown @ 2009-06-19 19:39 UTC (permalink / raw)
To: Corentin Chary; +Cc: linux-acpi
thanks for the refresh, Corentin, they're now applied.
thanks,
Len Brown, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 00/15] acpi4asus updates
2009-06-19 19:39 ` Len Brown
@ 2009-06-24 5:41 ` Len Brown
2009-06-24 6:39 ` Corentin Chary
2009-06-25 11:25 ` [PATCH 1/7] eeepc-laptop: Register as a pci-hotplug device Corentin Chary
0 siblings, 2 replies; 40+ messages in thread
From: Len Brown @ 2009-06-24 5:41 UTC (permalink / raw)
To: Corentin Chary; +Cc: linux-acpi
On Fri, 19 Jun 2009, Len Brown wrote:
> thanks for the refresh, Corentin, they're now applied.
Unfortunately, upstream scribbed more rfkill stuff on eeepc-laptop.c
I did take a swing at merging the conflicts, but got lost.
So it is probably best if you refresh those last 8 eeepc-laptop.c
patches and send them again.
Below is the log for what I was able to get in.
thanks,
Len Brown, Intel Open Source Technology Center
commit 21ab01e2fcbfcc0d1faba2b7336b3c0f7f3c1ac8
Author: Corentin Chary <corentincj@iksaif.net>
Date: Fri Jun 19 14:52:11 2009 +0200
asus-laptop: remove EXPERIMENTAL dependency
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 2fcc23da5522b89677fb0af6043a88e88fdd09a2
Author: Corentin Chary <corentincj@iksaif.net>
Date: Fri Jun 19 14:52:03 2009 +0200
asus-laptop: use pr_fmt and pr_<level>
Convert the unusual printk(ASUS_<level> uses to
the more standard pr_fmt and pr_<level>(.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
commit b31d0fde89c905673ceed0404d5ae24f2261d7c7
Author: Corentin Chary <corentincj@iksaif.net>
Date: Tue Jun 16 19:28:56 2009 +0000
eeepc-laptop: cpufv updates
Limit cpufv input to acceptables values.
Add an available_cpufv file to show available
presets.
Change cpufv ouput format from %d to %#x, it won't
break compatibility with existing userspace tools, but
it provide a more human readable output.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
commit b7b700d4a473d56103e87e341ad555e8a7cce06d
Author: Corentin Chary <corentincj@iksaif.net>
Date: Tue Jun 16 19:28:52 2009 +0000
eeepc-laptop: sync eeepc-laptop with asus_acpi
In the default Eee PC distribution, there is a modified
asus_acpi driver. eeepc-laptop is a cleaned version of this
driver. Sync ASL enum and getter/setters with asus_acpi.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 6122af3743a48dddae19810626dd7c9c8e6c1df8
Author: Corentin Chary <corentincj@iksaif.net>
Date: Tue Jun 16 19:28:48 2009 +0000
asus_acpi: Deprecate in favor of asus-laptop
asus-laptop have been merged in the kernel two years ago,
it is now stable and used by most distribution instead of
the old asus_acpi driver.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 76593d6fb0a51cb0d666f37d91a990e36c068365
Author: Corentin Chary <corentincj@iksaif.net>
Date: Tue Jun 16 19:28:47 2009 +0000
acpi4asus: update MAINTAINER and KConfig links
The bug tracker have moved from sourceforge to
http://dev.iksaif.net . The homepage of the project
is now http://acpi4asus.sf.net with links to the new
bug tracker. No change for the mailing list.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 116bf2e010a0600371aede450351973821dfd9e2
Author: Corentin Chary <corentincj@iksaif.net>
Date: Tue Jun 16 19:28:46 2009 +0000
asus-laptop: platform dev as parent for led and backlight
Makes asus-laptop platform device the parent device of
backlight and led classes.
With this patch, leds and backlight are also available in
/sys/devices/platform/asus-laptop/ like thinkpad_acpi.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
commit cede2cb6ee9b0ddaa3dbc9939418ff177a831600
Author: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Tue Jun 16 19:28:45 2009 +0000
eeepc-laptop: enable camera by default
If we leave the camera disabled by default, userspace programs (e.g.
Skype, Cheese) leave the user out in the cold saying that the machine
"has no camera." Therefore, it's better to enable camera by default
and
let people who really don't want it just disable the thing.
To reduce power usage you should enable USB autosuspend:
echo -n auto > /sys/bus/usb/drivers/uvcvideo/*:*/../power/level
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
commit 57599cc997b81a7c4f764693a7316886a72067fe
Merge: fbe8cdd 586caae
Author: Len Brown <len.brown@intel.com>
Date: Wed Jun 24 01:22:20 2009 -0400
Merge branch 'bjorn-notify' into release
Conflicts:
drivers/platform/x86/eeepc-laptop.c
Signed-off-by: Len Brown <len.brown@intel.com>
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 00/15] acpi4asus updates
2009-06-24 5:41 ` Len Brown
@ 2009-06-24 6:39 ` Corentin Chary
2009-06-25 16:42 ` Len Brown
2009-06-25 11:25 ` [PATCH 1/7] eeepc-laptop: Register as a pci-hotplug device Corentin Chary
1 sibling, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-24 6:39 UTC (permalink / raw)
To: Len Brown; +Cc: linux-acpi
On Wed, Jun 24, 2009 at 7:41 AM, Len Brown<lenb@kernel.org> wrote:
>
> On Fri, 19 Jun 2009, Len Brown wrote:
>
>> thanks for the refresh, Corentin, they're now applied.
>
> Unfortunately, upstream scribbed more rfkill stuff on eeepc-laptop.c
> I did take a swing at merging the conflicts, but got lost.
> So it is probably best if you refresh those last 8 eeepc-laptop.c
> patches and send them again.
>
Hi,
Isn't that fixed by http://lkml.org/lkml/2009/6/21/169 ?
Thanks
--
Corentin Chary
http://xf.iksaif.net - http://uffs.org
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH 1/7] eeepc-laptop: Register as a pci-hotplug device
2009-06-24 5:41 ` Len Brown
2009-06-24 6:39 ` Corentin Chary
@ 2009-06-25 11:25 ` Corentin Chary
2009-06-25 11:25 ` [PATCH 2/7] eeepc-laptop.c: use pr_fmt and pr_<level> Corentin Chary
1 sibling, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-25 11:25 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary, Matthew Garrett, Len Brown, Randy Dunlap
The eee contains a logically (but not physically) hotpluggable PCIe slot.
Currently this is handled by adding or removing the PCI device in response
to rfkill events, but if a user has forced pciehp to bind to it (with the
force=1 argument) then both drivers will try to handle the event and
hilarity (in the form of oopses) will ensue. This can be avoided by having
eee-laptop register the slot as a hotplug slot. Only one of pciehp and
eee-laptop will successfully register this, avoiding the problem.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Tested-by: Darren Salt <linux@youmustbejoking.demon.co.uk>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
drivers/platform/x86/Kconfig | 2 +
drivers/platform/x86/eeepc-laptop.c | 87 +++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 7232fe7..fee6a40 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -357,6 +357,8 @@ config EEEPC_LAPTOP
depends on RFKILL || RFKILL = n
select BACKLIGHT_CLASS_DEVICE
select HWMON
+ select HOTPLUG
+ select HOTPLUG_PCI if PCI
---help---
This driver supports the Fn-Fx keys on Eee PC laptops.
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 4207b26..c0b203c 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -31,6 +31,7 @@
#include <linux/input.h>
#include <linux/rfkill.h>
#include <linux/pci.h>
+#include <linux/pci_hotplug.h>
#define EEEPC_LAPTOP_VERSION "0.1"
@@ -143,6 +144,7 @@ struct eeepc_hotk {
u16 *keycode_map;
struct rfkill *eeepc_wlan_rfkill;
struct rfkill *eeepc_bluetooth_rfkill;
+ struct hotplug_slot *hotplug_slot;
};
/* The actual device the driver binds to */
@@ -213,6 +215,15 @@ static struct acpi_driver eeepc_hotk_driver = {
},
};
+/* PCI hotplug ops */
+static int eeepc_get_adapter_status(struct hotplug_slot *slot, u8 *value);
+
+static struct hotplug_slot_ops eeepc_hotplug_slot_ops = {
+ .owner = THIS_MODULE,
+ .get_adapter_status = eeepc_get_adapter_status,
+ .get_power_status = eeepc_get_adapter_status,
+};
+
/* The backlight device /sys/class/backlight */
static struct backlight_device *eeepc_backlight_device;
@@ -612,6 +623,19 @@ static int notify_brn(void)
return -1;
}
+static int eeepc_get_adapter_status(struct hotplug_slot *hotplug_slot,
+ u8 *value)
+{
+ int val = get_acpi(CM_ASL_WLAN);
+
+ if (val == 1 || val == 0)
+ *value = val;
+ else
+ return -EINVAL;
+
+ return 0;
+}
+
static void eeepc_rfkill_hotplug(void)
{
struct pci_dev *dev;
@@ -744,6 +768,54 @@ static void eeepc_unregister_rfkill_notifier(char *node)
}
}
+static void eeepc_cleanup_pci_hotplug(struct hotplug_slot *hotplug_slot)
+{
+ kfree(hotplug_slot->info);
+ kfree(hotplug_slot);
+}
+
+static int eeepc_setup_pci_hotplug(void)
+{
+ int ret = -ENOMEM;
+ struct pci_bus *bus = pci_find_bus(0, 1);
+
+ if (!bus) {
+ printk(EEEPC_ERR "Unable to find wifi PCI bus\n");
+ return -ENODEV;
+ }
+
+ ehotk->hotplug_slot = kzalloc(sizeof(struct hotplug_slot), GFP_KERNEL);
+ if (!ehotk->hotplug_slot)
+ goto error_slot;
+
+ ehotk->hotplug_slot->info = kzalloc(sizeof(struct hotplug_slot_info),
+ GFP_KERNEL);
+ if (!ehotk->hotplug_slot->info)
+ goto error_info;
+
+ ehotk->hotplug_slot->private = ehotk;
+ ehotk->hotplug_slot->release = &eeepc_cleanup_pci_hotplug;
+ ehotk->hotplug_slot->ops = &eeepc_hotplug_slot_ops;
+ eeepc_get_adapter_status(ehotk->hotplug_slot,
+ &ehotk->hotplug_slot->info->adapter_status);
+
+ ret = pci_hp_register(ehotk->hotplug_slot, bus, 0, "eeepc-wifi");
+ if (ret) {
+ printk(EEEPC_ERR "Unable to register hotplug slot - %d\n", ret);
+ goto error_register;
+ }
+
+ return 0;
+
+error_register:
+ kfree(ehotk->hotplug_slot->info);
+error_info:
+ kfree(ehotk->hotplug_slot);
+ ehotk->hotplug_slot = NULL;
+error_slot:
+ return ret;
+}
+
static int eeepc_hotk_add(struct acpi_device *device)
{
int result;
@@ -802,8 +874,21 @@ static int eeepc_hotk_add(struct acpi_device *device)
goto bluetooth_fail;
}
+ result = eeepc_setup_pci_hotplug();
+ /*
+ * If we get -EBUSY then something else is handling the PCI hotplug -
+ * don't fail in this case
+ */
+ if (result == -EBUSY)
+ return 0;
+ else if (result)
+ goto pci_fail;
+
return 0;
+ pci_fail:
+ if (ehotk->eeepc_bluetooth_rfkill)
+ rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
bluetooth_fail:
rfkill_destroy(ehotk->eeepc_bluetooth_rfkill);
rfkill_unregister(ehotk->eeepc_wlan_rfkill);
@@ -825,6 +910,8 @@ static int eeepc_hotk_remove(struct acpi_device *device, int type)
eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
+ if (ehotk->hotplug_slot)
+ pci_hp_deregister(ehotk->hotplug_slot);
kfree(ehotk);
return 0;
--
1.6.3.3
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 2/7] eeepc-laptop.c: use pr_fmt and pr_<level>
2009-06-25 11:25 ` [PATCH 1/7] eeepc-laptop: Register as a pci-hotplug device Corentin Chary
@ 2009-06-25 11:25 ` Corentin Chary
2009-06-25 11:25 ` [PATCH 3/7] eeepc-laptop: rfkill refactoring Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-25 11:25 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Joe Perches, Corentin Chary
From: Joe Perches <joe@perches.com>
Convert the unusual printk(EEEPC_<level> uses to
the more standard pr_fmt and pr_<level>(.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 55 ++++++++++++++---------------------
1 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index c0b203c..d14f714 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -16,6 +16,8 @@
* GNU General Public License for more details.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -41,11 +43,6 @@
#define EEEPC_HOTK_DEVICE_NAME "Hotkey"
#define EEEPC_HOTK_HID "ASUS010"
-#define EEEPC_LOG EEEPC_HOTK_FILE ": "
-#define EEEPC_ERR KERN_ERR EEEPC_LOG
-#define EEEPC_WARNING KERN_WARNING EEEPC_LOG
-#define EEEPC_NOTICE KERN_NOTICE EEEPC_LOG
-#define EEEPC_INFO KERN_INFO EEEPC_LOG
/*
* Definitions for Asus EeePC
@@ -285,7 +282,7 @@ static int set_acpi(int cm, int value)
if (method == NULL)
return -ENODEV;
if (write_acpi_int(ehotk->handle, method, value, NULL))
- printk(EEEPC_WARNING "Error writing %s\n", method);
+ pr_warning("Error writing %s\n", method);
}
return 0;
}
@@ -298,7 +295,7 @@ static int get_acpi(int cm)
if (method == NULL)
return -ENODEV;
if (read_acpi_int(ehotk->handle, method, &value))
- printk(EEEPC_WARNING "Error reading %s\n", method);
+ pr_warning("Error reading %s\n", method);
}
return value;
}
@@ -562,26 +559,23 @@ static int eeepc_hotk_check(void)
if (ehotk->device->status.present) {
if (write_acpi_int(ehotk->handle, "INIT", ehotk->init_flag,
&buffer)) {
- printk(EEEPC_ERR "Hotkey initialization failed\n");
+ pr_err("Hotkey initialization failed\n");
return -ENODEV;
} else {
- printk(EEEPC_NOTICE "Hotkey init flags 0x%x\n",
- ehotk->init_flag);
+ pr_notice("Hotkey init flags 0x%x\n", ehotk->init_flag);
}
/* get control methods supported */
if (read_acpi_int(ehotk->handle, "CMSG"
, &ehotk->cm_supported)) {
- printk(EEEPC_ERR
- "Get control methods supported failed\n");
+ pr_err("Get control methods supported failed\n");
return -ENODEV;
} else {
- printk(EEEPC_INFO
- "Get control methods supported: 0x%x\n",
- ehotk->cm_supported);
+ pr_info("Get control methods supported: 0x%x\n",
+ ehotk->cm_supported);
}
ehotk->inputdev = input_allocate_device();
if (!ehotk->inputdev) {
- printk(EEEPC_INFO "Unable to allocate input device\n");
+ pr_info("Unable to allocate input device\n");
return 0;
}
ehotk->inputdev->name = "Asus EeePC extra buttons";
@@ -600,12 +594,12 @@ static int eeepc_hotk_check(void)
}
result = input_register_device(ehotk->inputdev);
if (result) {
- printk(EEEPC_INFO "Unable to register input device\n");
+ pr_info("Unable to register input device\n");
input_free_device(ehotk->inputdev);
return 0;
}
} else {
- printk(EEEPC_ERR "Hotkey device not present, aborting\n");
+ pr_err("Hotkey device not present, aborting\n");
return -EINVAL;
}
return 0;
@@ -643,7 +637,7 @@ static void eeepc_rfkill_hotplug(void)
bool blocked;
if (!bus) {
- printk(EEEPC_WARNING "Unable to find PCI bus 1?\n");
+ pr_warning("Unable to find PCI bus 1?\n");
return;
}
@@ -659,7 +653,7 @@ static void eeepc_rfkill_hotplug(void)
if (dev) {
pci_bus_assign_resources(bus);
if (pci_bus_add_device(dev))
- printk(EEEPC_ERR "Unable to hotplug wifi\n");
+ pr_err("Unable to hotplug wifi\n");
}
} else {
dev = pci_get_slot(bus, 0);
@@ -742,8 +736,7 @@ static int eeepc_register_rfkill_notifier(char *node)
eeepc_rfkill_notify,
NULL);
if (ACPI_FAILURE(status))
- printk(EEEPC_WARNING
- "Failed to register notify on %s\n", node);
+ pr_warning("Failed to register notify on %s\n", node);
} else
return -ENODEV;
@@ -762,8 +755,7 @@ static void eeepc_unregister_rfkill_notifier(char *node)
ACPI_SYSTEM_NOTIFY,
eeepc_rfkill_notify);
if (ACPI_FAILURE(status))
- printk(EEEPC_ERR
- "Error removing rfkill notify handler %s\n",
+ pr_err("Error removing rfkill notify handler %s\n",
node);
}
}
@@ -780,7 +772,7 @@ static int eeepc_setup_pci_hotplug(void)
struct pci_bus *bus = pci_find_bus(0, 1);
if (!bus) {
- printk(EEEPC_ERR "Unable to find wifi PCI bus\n");
+ pr_err("Unable to find wifi PCI bus\n");
return -ENODEV;
}
@@ -801,7 +793,7 @@ static int eeepc_setup_pci_hotplug(void)
ret = pci_hp_register(ehotk->hotplug_slot, bus, 0, "eeepc-wifi");
if (ret) {
- printk(EEEPC_ERR "Unable to register hotplug slot - %d\n", ret);
+ pr_err("Unable to register hotplug slot - %d\n", ret);
goto error_register;
}
@@ -822,7 +814,7 @@ static int eeepc_hotk_add(struct acpi_device *device)
if (!device)
return -EINVAL;
- printk(EEEPC_NOTICE EEEPC_HOTK_NAME "\n");
+ pr_notice(EEEPC_HOTK_NAME "\n");
ehotk = kzalloc(sizeof(struct eeepc_hotk), GFP_KERNEL);
if (!ehotk)
return -ENOMEM;
@@ -1105,8 +1097,7 @@ static int eeepc_backlight_init(struct device *dev)
bd = backlight_device_register(EEEPC_HOTK_FILE, dev,
NULL, &eeepcbl_ops);
if (IS_ERR(bd)) {
- printk(EEEPC_ERR
- "Could not register eeepc backlight device\n");
+ pr_err("Could not register eeepc backlight device\n");
eeepc_backlight_device = NULL;
return PTR_ERR(bd);
}
@@ -1125,8 +1116,7 @@ static int eeepc_hwmon_init(struct device *dev)
hwmon = hwmon_device_register(dev);
if (IS_ERR(hwmon)) {
- printk(EEEPC_ERR
- "Could not register eeepc hwmon device\n");
+ pr_err("Could not register eeepc hwmon device\n");
eeepc_hwmon_device = NULL;
return PTR_ERR(hwmon);
}
@@ -1159,8 +1149,7 @@ static int __init eeepc_laptop_init(void)
if (result)
goto fail_backlight;
} else
- printk(EEEPC_INFO "Backlight controlled by ACPI video "
- "driver\n");
+ pr_info("Backlight controlled by ACPI video driver\n");
result = eeepc_hwmon_init(dev);
if (result)
--
1.6.3.3
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 3/7] eeepc-laptop: rfkill refactoring
2009-06-25 11:25 ` [PATCH 2/7] eeepc-laptop.c: use pr_fmt and pr_<level> Corentin Chary
@ 2009-06-25 11:25 ` Corentin Chary
2009-06-25 11:25 ` [PATCH 4/7] eeepc-laptop: right parent device Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-25 11:25 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Refactor rfkill code, because we'll add another
rfkill for wwan3g later.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 160 ++++++++++++++++++-----------------
1 files changed, 84 insertions(+), 76 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index d14f714..e46981a 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -139,8 +139,8 @@ struct eeepc_hotk {
u16 event_count[128]; /* count for each event */
struct input_dev *inputdev;
u16 *keycode_map;
- struct rfkill *eeepc_wlan_rfkill;
- struct rfkill *eeepc_bluetooth_rfkill;
+ struct rfkill *wlan_rfkill;
+ struct rfkill *bluetooth_rfkill;
struct hotplug_slot *hotplug_slot;
};
@@ -663,7 +663,7 @@ static void eeepc_rfkill_hotplug(void)
}
}
- rfkill_set_sw_state(ehotk->eeepc_wlan_rfkill, blocked);
+ rfkill_set_sw_state(ehotk->wlan_rfkill, blocked);
}
static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
@@ -828,66 +828,8 @@ static int eeepc_hotk_add(struct acpi_device *device)
if (result)
goto ehotk_fail;
- eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
- eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
-
- if (get_acpi(CM_ASL_WLAN) != -1) {
- ehotk->eeepc_wlan_rfkill = rfkill_alloc("eeepc-wlan",
- &device->dev,
- RFKILL_TYPE_WLAN,
- &eeepc_rfkill_ops,
- (void *)CM_ASL_WLAN);
-
- if (!ehotk->eeepc_wlan_rfkill)
- goto wlan_fail;
-
- rfkill_init_sw_state(ehotk->eeepc_wlan_rfkill,
- get_acpi(CM_ASL_WLAN) != 1);
- result = rfkill_register(ehotk->eeepc_wlan_rfkill);
- if (result)
- goto wlan_fail;
- }
-
- if (get_acpi(CM_ASL_BLUETOOTH) != -1) {
- ehotk->eeepc_bluetooth_rfkill =
- rfkill_alloc("eeepc-bluetooth",
- &device->dev,
- RFKILL_TYPE_BLUETOOTH,
- &eeepc_rfkill_ops,
- (void *)CM_ASL_BLUETOOTH);
-
- if (!ehotk->eeepc_bluetooth_rfkill)
- goto bluetooth_fail;
-
- rfkill_init_sw_state(ehotk->eeepc_bluetooth_rfkill,
- get_acpi(CM_ASL_BLUETOOTH) != 1);
- result = rfkill_register(ehotk->eeepc_bluetooth_rfkill);
- if (result)
- goto bluetooth_fail;
- }
-
- result = eeepc_setup_pci_hotplug();
- /*
- * If we get -EBUSY then something else is handling the PCI hotplug -
- * don't fail in this case
- */
- if (result == -EBUSY)
- return 0;
- else if (result)
- goto pci_fail;
-
return 0;
- pci_fail:
- if (ehotk->eeepc_bluetooth_rfkill)
- rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
- bluetooth_fail:
- rfkill_destroy(ehotk->eeepc_bluetooth_rfkill);
- rfkill_unregister(ehotk->eeepc_wlan_rfkill);
- wlan_fail:
- rfkill_destroy(ehotk->eeepc_wlan_rfkill);
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
ehotk_fail:
kfree(ehotk);
ehotk = NULL;
@@ -900,18 +842,13 @@ static int eeepc_hotk_remove(struct acpi_device *device, int type)
if (!device || !acpi_driver_data(device))
return -EINVAL;
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
- eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
- if (ehotk->hotplug_slot)
- pci_hp_deregister(ehotk->hotplug_slot);
-
kfree(ehotk);
return 0;
}
static int eeepc_hotk_resume(struct acpi_device *device)
{
- if (ehotk->eeepc_wlan_rfkill) {
+ if (ehotk->wlan_rfkill) {
bool wlan;
/* Workaround - it seems that _PTS disables the wireless
@@ -923,14 +860,13 @@ static int eeepc_hotk_resume(struct acpi_device *device)
wlan = get_acpi(CM_ASL_WLAN);
set_acpi(CM_ASL_WLAN, wlan);
- rfkill_set_sw_state(ehotk->eeepc_wlan_rfkill,
- wlan != 1);
+ rfkill_set_sw_state(ehotk->wlan_rfkill, wlan != 1);
eeepc_rfkill_hotplug();
}
- if (ehotk->eeepc_bluetooth_rfkill)
- rfkill_set_sw_state(ehotk->eeepc_bluetooth_rfkill,
+ if (ehotk->bluetooth_rfkill)
+ rfkill_set_sw_state(ehotk->bluetooth_rfkill,
get_acpi(CM_ASL_BLUETOOTH) != 1);
return 0;
@@ -1052,10 +988,14 @@ static void eeepc_backlight_exit(void)
static void eeepc_rfkill_exit(void)
{
- if (ehotk->eeepc_wlan_rfkill)
- rfkill_unregister(ehotk->eeepc_wlan_rfkill);
- if (ehotk->eeepc_bluetooth_rfkill)
- rfkill_unregister(ehotk->eeepc_bluetooth_rfkill);
+ eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P6");
+ eeepc_unregister_rfkill_notifier("\\_SB.PCI0.P0P7");
+ if (ehotk->wlan_rfkill)
+ rfkill_unregister(ehotk->wlan_rfkill);
+ if (ehotk->bluetooth_rfkill)
+ rfkill_unregister(ehotk->bluetooth_rfkill);
+ if (ehotk->hotplug_slot)
+ pci_hp_deregister(ehotk->hotplug_slot);
}
static void eeepc_input_exit(void)
@@ -1090,6 +1030,67 @@ static void __exit eeepc_laptop_exit(void)
platform_driver_unregister(&platform_driver);
}
+static int eeepc_new_rfkill(struct rfkill **rfkill,
+ const char *name, struct device *dev,
+ enum rfkill_type type, int cm)
+{
+ int result;
+
+ if (get_acpi(cm) == -1)
+ return -ENODEV;
+
+ *rfkill = rfkill_alloc(name, dev, type,
+ &eeepc_rfkill_ops, (void *)(unsigned long)cm);
+
+ if (!*rfkill)
+ return -EINVAL;
+
+ rfkill_init_sw_state(*rfkill, get_acpi(cm) != 1);
+ result = rfkill_register(*rfkill);
+ if (result) {
+ rfkill_destroy(*rfkill);
+ *rfkill = NULL;
+ return result;
+ }
+ return 0;
+}
+
+
+static int eeepc_rfkill_init(struct device *dev)
+{
+ int result = 0;
+
+ eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P6");
+ eeepc_register_rfkill_notifier("\\_SB.PCI0.P0P7");
+
+ result = eeepc_new_rfkill(&ehotk->wlan_rfkill,
+ "eeepc-wlan", dev,
+ RFKILL_TYPE_WLAN, CM_ASL_WLAN);
+
+ if (result && result != -ENODEV)
+ goto exit;
+
+ result = eeepc_new_rfkill(&ehotk->bluetooth_rfkill,
+ "eeepc-bluetooth", dev,
+ RFKILL_TYPE_BLUETOOTH, CM_ASL_BLUETOOTH);
+
+ if (result && result != -ENODEV)
+ goto exit;
+
+ result = eeepc_setup_pci_hotplug();
+ /*
+ * If we get -EBUSY then something else is handling the PCI hotplug -
+ * don't fail in this case
+ */
+ if (result == -EBUSY)
+ result = 0;
+
+exit:
+ if (result && result != -ENODEV)
+ eeepc_rfkill_exit();
+ return result;
+}
+
static int eeepc_backlight_init(struct device *dev)
{
struct backlight_device *bd;
@@ -1173,7 +1174,15 @@ static int __init eeepc_laptop_init(void)
&platform_attribute_group);
if (result)
goto fail_sysfs;
+
+ result = eeepc_rfkill_init(dev);
+ if (result)
+ goto fail_rfkill;
+
return 0;
+fail_rfkill:
+ sysfs_remove_group(&platform_device->dev.kobj,
+ &platform_attribute_group);
fail_sysfs:
platform_device_del(platform_device);
fail_platform_device2:
@@ -1186,7 +1195,6 @@ fail_hwmon:
eeepc_backlight_exit();
fail_backlight:
eeepc_input_exit();
- eeepc_rfkill_exit();
return result;
}
--
1.6.3.3
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 4/7] eeepc-laptop: right parent device
2009-06-25 11:25 ` [PATCH 3/7] eeepc-laptop: rfkill refactoring Corentin Chary
@ 2009-06-25 11:25 ` Corentin Chary
2009-06-25 11:25 ` [PATCH 5/7] eeepc-laptop: makes get_acpi() returns -ENODEV Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-25 11:25 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index e46981a..5b102c2 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -1143,18 +1143,6 @@ static int __init eeepc_laptop_init(void)
acpi_bus_unregister_driver(&eeepc_hotk_driver);
return -ENODEV;
}
- dev = acpi_get_physical_device(ehotk->device->handle);
-
- if (!acpi_video_backlight_support()) {
- result = eeepc_backlight_init(dev);
- if (result)
- goto fail_backlight;
- } else
- pr_info("Backlight controlled by ACPI video driver\n");
-
- result = eeepc_hwmon_init(dev);
- if (result)
- goto fail_hwmon;
eeepc_enable_camera();
@@ -1175,12 +1163,30 @@ static int __init eeepc_laptop_init(void)
if (result)
goto fail_sysfs;
+ dev = &platform_device->dev;
+
+ if (!acpi_video_backlight_support()) {
+ result = eeepc_backlight_init(dev);
+ if (result)
+ goto fail_backlight;
+ } else
+ pr_info("Backlight controlled by ACPI video "
+ "driver\n");
+
+ result = eeepc_hwmon_init(dev);
+ if (result)
+ goto fail_hwmon;
+
result = eeepc_rfkill_init(dev);
if (result)
goto fail_rfkill;
return 0;
fail_rfkill:
+ eeepc_hwmon_exit();
+fail_hwmon:
+ eeepc_backlight_exit();
+fail_backlight:
sysfs_remove_group(&platform_device->dev.kobj,
&platform_attribute_group);
fail_sysfs:
@@ -1190,10 +1196,6 @@ fail_platform_device2:
fail_platform_device1:
platform_driver_unregister(&platform_driver);
fail_platform_driver:
- eeepc_hwmon_exit();
-fail_hwmon:
- eeepc_backlight_exit();
-fail_backlight:
eeepc_input_exit();
return result;
}
--
1.6.3.3
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 5/7] eeepc-laptop: makes get_acpi() returns -ENODEV
2009-06-25 11:25 ` [PATCH 4/7] eeepc-laptop: right parent device Corentin Chary
@ 2009-06-25 11:25 ` Corentin Chary
2009-06-25 11:25 ` [PATCH 6/7] eeepc-laptop: get the right value for CMSG Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-25 11:25 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
If there is there is no getter defined, get_acpi()
will return -ENODEV.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 5b102c2..19cc9ae 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -289,7 +289,7 @@ static int set_acpi(int cm, int value)
static int get_acpi(int cm)
{
- int value = -1;
+ int value = -ENODEV;
if ((ehotk->cm_supported & (0x1 << cm))) {
const char *method = cm_getv[cm];
if (method == NULL)
@@ -367,13 +367,19 @@ static ssize_t store_sys_acpi(int cm, const char *buf, size_t count)
rv = parse_arg(buf, count, &value);
if (rv > 0)
- set_acpi(cm, value);
+ value = set_acpi(cm, value);
+ if (value < 0)
+ return value;
return rv;
}
static ssize_t show_sys_acpi(int cm, char *buf)
{
- return sprintf(buf, "%d\n", get_acpi(cm));
+ int value = get_acpi(cm);
+
+ if (value < 0)
+ return value;
+ return sprintf(buf, "%d\n", value);
}
#define EEEPC_CREATE_DEVICE_ATTR(_name, _cm) \
@@ -1036,8 +1042,9 @@ static int eeepc_new_rfkill(struct rfkill **rfkill,
{
int result;
- if (get_acpi(cm) == -1)
- return -ENODEV;
+ result = get_acpi(cm);
+ if (result < 0)
+ return result;
*rfkill = rfkill_alloc(name, dev, type,
&eeepc_rfkill_ops, (void *)(unsigned long)cm);
--
1.6.3.3
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 6/7] eeepc-laptop: get the right value for CMSG
2009-06-25 11:25 ` [PATCH 5/7] eeepc-laptop: makes get_acpi() returns -ENODEV Corentin Chary
@ 2009-06-25 11:25 ` Corentin Chary
2009-06-25 11:25 ` [PATCH 7/7] eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go Corentin Chary
0 siblings, 1 reply; 40+ messages in thread
From: Corentin Chary @ 2009-06-25 11:25 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary
CMSG is an ACPI method used to find features available on
an Eee PC. But some features are never repported, even if present.
If the getter of a feature is present, this patch will set
the corresponding bit in cmsg.
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 19cc9ae..f5d8473 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -553,6 +553,28 @@ static int eeepc_setkeycode(struct input_dev *dev, int scancode, int keycode)
return -EINVAL;
}
+static void cmsg_quirk(int cm, const char *name)
+{
+ int dummy;
+
+ /* Some BIOSes do not report cm although it is avaliable.
+ Check if cm_getv[cm] works and, if yes, assume cm should be set. */
+ if (!(ehotk->cm_supported & (1 << cm))
+ && !read_acpi_int(ehotk->handle, cm_getv[cm], &dummy)) {
+ pr_info("%s (%x) not reported by BIOS,"
+ " enabling anyway\n", name, 1 << cm);
+ ehotk->cm_supported |= 1 << cm;
+ }
+}
+
+static void cmsg_quirks(void)
+{
+ cmsg_quirk(CM_ASL_LID, "LID");
+ cmsg_quirk(CM_ASL_TYPE, "TYPE");
+ cmsg_quirk(CM_ASL_PANELPOWER, "PANELPOWER");
+ cmsg_quirk(CM_ASL_TPD, "TPD");
+}
+
static int eeepc_hotk_check(void)
{
const struct key_entry *key;
@@ -576,6 +598,7 @@ static int eeepc_hotk_check(void)
pr_err("Get control methods supported failed\n");
return -ENODEV;
} else {
+ cmsg_quirks();
pr_info("Get control methods supported: 0x%x\n",
ehotk->cm_supported);
}
--
1.6.3.3
^ permalink raw reply related [flat|nested] 40+ messages in thread
* [PATCH 7/7] eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go
2009-06-25 11:25 ` [PATCH 6/7] eeepc-laptop: get the right value for CMSG Corentin Chary
@ 2009-06-25 11:25 ` Corentin Chary
0 siblings, 0 replies; 40+ messages in thread
From: Corentin Chary @ 2009-06-25 11:25 UTC (permalink / raw)
To: lenb; +Cc: linux-acpi, Corentin Chary, Janne Grunau
Signed-off-by: Janne Grunau <j@jannau.net>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
drivers/platform/x86/eeepc-laptop.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index f5d8473..ec560f1 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -141,6 +141,7 @@ struct eeepc_hotk {
u16 *keycode_map;
struct rfkill *wlan_rfkill;
struct rfkill *bluetooth_rfkill;
+ struct rfkill *wwan3g_rfkill;
struct hotplug_slot *hotplug_slot;
};
@@ -1023,6 +1024,8 @@ static void eeepc_rfkill_exit(void)
rfkill_unregister(ehotk->wlan_rfkill);
if (ehotk->bluetooth_rfkill)
rfkill_unregister(ehotk->bluetooth_rfkill);
+ if (ehotk->wwan3g_rfkill)
+ rfkill_unregister(ehotk->wwan3g_rfkill);
if (ehotk->hotplug_slot)
pci_hp_deregister(ehotk->hotplug_slot);
}
@@ -1107,6 +1110,13 @@ static int eeepc_rfkill_init(struct device *dev)
if (result && result != -ENODEV)
goto exit;
+ result = eeepc_new_rfkill(&ehotk->wwan3g_rfkill,
+ "eeepc-wwan3g", dev,
+ RFKILL_TYPE_WWAN, CM_ASL_3G);
+
+ if (result && result != -ENODEV)
+ goto exit;
+
result = eeepc_setup_pci_hotplug();
/*
* If we get -EBUSY then something else is handling the PCI hotplug -
--
1.6.3.3
^ permalink raw reply related [flat|nested] 40+ messages in thread
* Re: [PATCH 00/15] acpi4asus updates
2009-06-24 6:39 ` Corentin Chary
@ 2009-06-25 16:42 ` Len Brown
2009-06-26 3:14 ` Stephen Rothwell
0 siblings, 1 reply; 40+ messages in thread
From: Len Brown @ 2009-06-25 16:42 UTC (permalink / raw)
To: Corentin Chary; +Cc: linux-acpi, sfr
On Wed, 24 Jun 2009, Corentin Chary wrote:
> On Wed, Jun 24, 2009 at 7:41 AM, Len Brown<lenb@kernel.org> wrote:
> > Unfortunately, upstream scribbed more rfkill stuff on eeepc-laptop.c
> > I did take a swing at merging the conflicts, but got lost.
> > So it is probably best if you refresh those last 8 eeepc-laptop.c
> > patches and send them again.
> Isn't that fixed by http://lkml.org/lkml/2009/6/21/169 ?
Hmm, apparently so -- I didn't receive that note.
I suppose if Stephen signed off on it, I could have applied it
and not dropped the tail of your patch series from rc1...
Anyway, thanks for refreshing the patches,
I've checked them in and they'll be in my -rc2 push.
cheers,
Len Brown, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 40+ messages in thread
* Re: [PATCH 00/15] acpi4asus updates
2009-06-25 16:42 ` Len Brown
@ 2009-06-26 3:14 ` Stephen Rothwell
0 siblings, 0 replies; 40+ messages in thread
From: Stephen Rothwell @ 2009-06-26 3:14 UTC (permalink / raw)
To: Len Brown; +Cc: Corentin Chary, linux-acpi
[-- Attachment #1: Type: text/plain, Size: 1099 bytes --]
Hi Len,
On Thu, 25 Jun 2009 12:42:14 -0400 (EDT) Len Brown <lenb@kernel.org> wrote:
>
> On Wed, 24 Jun 2009, Corentin Chary wrote:
>
> > On Wed, Jun 24, 2009 at 7:41 AM, Len Brown<lenb@kernel.org> wrote:
>
> > > Unfortunately, upstream scribbed more rfkill stuff on eeepc-laptop.c
> > > I did take a swing at merging the conflicts, but got lost.
> > > So it is probably best if you refresh those last 8 eeepc-laptop.c
> > > patches and send them again.
>
> > Isn't that fixed by http://lkml.org/lkml/2009/6/21/169 ?
That is just showing how I resolved the conflict when I merged the
wireless tree into linux-next that day ...
> Hmm, apparently so -- I didn't receive that note.
> I suppose if Stephen signed off on it, I could have applied it
> and not dropped the tail of your patch series from rc1...
so it is not a patch that can be applied.
> Anyway, thanks for refreshing the patches,
> I've checked them in and they'll be in my -rc2 push.
Thanks.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 40+ messages in thread
end of thread, other threads:[~2009-06-26 3:14 UTC | newest]
Thread overview: 40+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-06-16 19:28 [PATCH 00/15] acpi4asus updates Corentin Chary
2009-06-16 19:28 ` [PATCH 01/15] eeepc-laptop: Register as a pci-hotplug device Corentin Chary
2009-06-16 19:28 ` [PATCH 02/15] eeepc: fix kconfig selects Corentin Chary
2009-06-16 19:28 ` [PATCH 03/15] eeepc-laptop.c: use pr_fmt and pr_<level> Corentin Chary
2009-06-16 19:28 ` [PATCH 04/15] eeepc-laptop: enable camera by default Corentin Chary
2009-06-16 19:28 ` [PATCH 05/15] asus-laptop: platform dev as parent for led and backlight Corentin Chary
2009-06-16 19:28 ` [PATCH 06/15] acpi4asus: update MAINTAINER and KConfig links Corentin Chary
2009-06-16 19:28 ` [PATCH 07/15] asus_acpi: Deprecate in favor of asus-laptop Corentin Chary
2009-06-16 19:28 ` [PATCH 08/15] asus-laptop: use pr_fmt and pr_<level> Corentin Chary
2009-06-16 19:28 ` [PATCH 09/15] eeepc-laptop: rfkill refactoring Corentin Chary
2009-06-16 19:28 ` [PATCH 10/15] eeepc-laptop: right parent device Corentin Chary
2009-06-16 19:28 ` [PATCH 11/15] eeepc-laptop: sync eeepc-laptop with asus_acpi Corentin Chary
2009-06-16 19:28 ` [PATCH 12/15] eeepc-laptop: makes get_acpi() returns -ENODEV Corentin Chary
2009-06-16 19:28 ` [PATCH 13/15] eeepc-laptop: get the right value for CMSG Corentin Chary
2009-06-16 19:28 ` [PATCH 14/15] eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go Corentin Chary
2009-06-16 19:28 ` [PATCH 15/15] eeepc-laptop: cpufv updates Corentin Chary
2009-06-18 2:41 ` [PATCH 00/15] acpi4asus updates Len Brown
2009-06-18 6:21 ` Len Brown
2009-06-19 8:28 ` Corentin Chary
2009-06-19 19:39 ` Len Brown
2009-06-24 5:41 ` Len Brown
2009-06-24 6:39 ` Corentin Chary
2009-06-25 16:42 ` Len Brown
2009-06-26 3:14 ` Stephen Rothwell
2009-06-25 11:25 ` [PATCH 1/7] eeepc-laptop: Register as a pci-hotplug device Corentin Chary
2009-06-25 11:25 ` [PATCH 2/7] eeepc-laptop.c: use pr_fmt and pr_<level> Corentin Chary
2009-06-25 11:25 ` [PATCH 3/7] eeepc-laptop: rfkill refactoring Corentin Chary
2009-06-25 11:25 ` [PATCH 4/7] eeepc-laptop: right parent device Corentin Chary
2009-06-25 11:25 ` [PATCH 5/7] eeepc-laptop: makes get_acpi() returns -ENODEV Corentin Chary
2009-06-25 11:25 ` [PATCH 6/7] eeepc-laptop: get the right value for CMSG Corentin Chary
2009-06-25 11:25 ` [PATCH 7/7] eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go Corentin Chary
2009-06-19 12:52 ` [PATCH 1/9] asus-laptop: use pr_fmt and pr_<level> Corentin Chary
2009-06-19 12:52 ` [PATCH 2/9] eeepc-laptop: Register as a pci-hotplug device Corentin Chary
2009-06-19 12:52 ` [PATCH 3/9] eeepc-laptop.c: use pr_fmt and pr_<level> Corentin Chary
2009-06-19 12:52 ` [PATCH 4/9] eeepc-laptop: rfkill refactoring Corentin Chary
2009-06-19 12:52 ` [PATCH 5/9] eeepc-laptop: right parent device Corentin Chary
2009-06-19 12:52 ` [PATCH 6/9] eeepc-laptop: makes get_acpi() returns -ENODEV Corentin Chary
2009-06-19 12:52 ` [PATCH 7/9] eeepc-laptop: get the right value for CMSG Corentin Chary
2009-06-19 12:52 ` [PATCH 8/9] eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go Corentin Chary
2009-06-19 12:52 ` [PATCH 9/9] asus-laptop: remove EXPERIMENTAL dependency Corentin Chary
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.