hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'misc-up-now' and 'platform-drivers' into release

This commit is contained in:
Len Brown 2009-03-16 00:38:52 -04:00
parent 27ce341983 da511997d2
commit 1b958a3e53
6 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/platform/x86/Kconfig
View File

@ -15,8 +15,7 @@ menuconfig X86_PLATFORM_DEVICES
if X86_PLATFORM_DEVICES if X86_PLATFORM_DEVICES
config ACER_WMI config ACER_WMI
tristate "Acer WMI Laptop Extras (EXPERIMENTAL)" tristate "Acer WMI Laptop Extras"
depends on EXPERIMENTAL
depends on ACPI depends on ACPI
depends on LEDS_CLASS depends on LEDS_CLASS
depends on NEW_LEDS depends on NEW_LEDS
@ -39,9 +38,9 @@ config ASUS_LAPTOP
tristate "Asus Laptop Extras (EXPERIMENTAL)" tristate "Asus Laptop Extras (EXPERIMENTAL)"
depends on ACPI depends on ACPI
depends on EXPERIMENTAL && !ACPI_ASUS depends on EXPERIMENTAL && !ACPI_ASUS
depends on LEDS_CLASS select LEDS_CLASS
depends on NEW_LEDS select NEW_LEDS
depends on BACKLIGHT_CLASS_DEVICE select BACKLIGHT_CLASS_DEVICE
depends on INPUT depends on INPUT
---help--- ---help---
This is the new Linux driver for Asus laptops. It may also support some This is the new Linux driver for Asus laptops. It may also support some
@ -185,11 +184,11 @@ config SONYPI_COMPAT
config THINKPAD_ACPI config THINKPAD_ACPI
tristate "ThinkPad ACPI Laptop Extras" tristate "ThinkPad ACPI Laptop Extras"
depends on ACPI depends on ACPI
depends on INPUT
select BACKLIGHT_LCD_SUPPORT select BACKLIGHT_LCD_SUPPORT
select BACKLIGHT_CLASS_DEVICE select BACKLIGHT_CLASS_DEVICE
select HWMON select HWMON
select NVRAM select NVRAM
select INPUT
select NEW_LEDS select NEW_LEDS
select LEDS_CLASS select LEDS_CLASS
select NET select NET
@ -315,9 +314,8 @@ config EEEPC_LAPTOP
config ACPI_WMI config ACPI_WMI
tristate "WMI (EXPERIMENTAL)" tristate "WMI"
depends on ACPI depends on ACPI
depends on EXPERIMENTAL
help help
This driver adds support for the ACPI-WMI (Windows Management This driver adds support for the ACPI-WMI (Windows Management
Instrumentation) mapper device (PNP0C14) found on some systems. Instrumentation) mapper device (PNP0C14) found on some systems.

2
drivers/platform/x86/acer-wmi.c
View File

@ -1026,7 +1026,7 @@ static void acer_rfkill_exit(void)
kfree(wireless_rfkill->data); kfree(wireless_rfkill->data);
rfkill_unregister(wireless_rfkill); rfkill_unregister(wireless_rfkill);
if (has_cap(ACER_CAP_BLUETOOTH)) { if (has_cap(ACER_CAP_BLUETOOTH)) {
kfree(wireless_rfkill->data); kfree(bluetooth_rfkill->data);
rfkill_unregister(bluetooth_rfkill); rfkill_unregister(bluetooth_rfkill);
} }
return; return;

5
drivers/platform/x86/asus-laptop.c
View File

@ -815,6 +815,7 @@ static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode)
static void asus_hotk_notify(acpi_handle handle, u32 event, void *data) static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
{ {
static struct key_entry *key; static struct key_entry *key;
u16 count;
/* TODO Find a better way to handle events count. */ /* TODO Find a better way to handle events count. */
if (!hotk) if (!hotk)
@ -832,9 +833,11 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
lcd_blank(FB_BLANK_POWERDOWN); lcd_blank(FB_BLANK_POWERDOWN);
} }
count = hotk->event_count[event % 128]++;
acpi_bus_generate_proc_event(hotk->device, event, count);
acpi_bus_generate_netlink_event(hotk->device->pnp.device_class, acpi_bus_generate_netlink_event(hotk->device->pnp.device_class,
dev_name(&hotk->device->dev), event, dev_name(&hotk->device->dev), event,
hotk->event_count[event % 128]++); count);
if (hotk->inputdev) { if (hotk->inputdev) {
key = asus_get_entry_by_scancode(event); key = asus_get_entry_by_scancode(event);

6
drivers/platform/x86/eeepc-laptop.c
View File

@ -557,13 +557,17 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data) static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
{ {
static struct key_entry *key; static struct key_entry *key;
u16 count;
if (!ehotk) if (!ehotk)
return; return;
if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX) if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX)
notify_brn(); notify_brn();
count = ehotk->event_count[event % 128]++;
acpi_bus_generate_proc_event(ehotk->device, event, count);
acpi_bus_generate_netlink_event(ehotk->device->pnp.device_class, acpi_bus_generate_netlink_event(ehotk->device->pnp.device_class,
dev_name(&ehotk->device->dev), event, dev_name(&ehotk->device->dev), event,
ehotk->event_count[event % 128]++); count);
if (ehotk->inputdev) { if (ehotk->inputdev) {
key = eepc_get_entry_by_scancode(event); key = eepc_get_entry_by_scancode(event);
if (key) { if (key) {

8
drivers/platform/x86/thinkpad_acpi.c
View File

@ -7532,7 +7532,7 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME);
* if it is not there yet. * if it is not there yet.
*/ */
#define IBM_BIOS_MODULE_ALIAS(__type) \ #define IBM_BIOS_MODULE_ALIAS(__type) \
MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW") MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*")
/* Non-ancient thinkpads */ /* Non-ancient thinkpads */
MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*"); MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*");
@ -7541,9 +7541,9 @@ MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");
/* Ancient thinkpad BIOSes have to be identified by /* Ancient thinkpad BIOSes have to be identified by
* BIOS type or model number, and there are far less * BIOS type or model number, and there are far less
* BIOS types than model numbers... */ * BIOS types than model numbers... */
IBM_BIOS_MODULE_ALIAS("I[B,D,H,I,M,N,O,T,W,V,Y,Z]"); IBM_BIOS_MODULE_ALIAS("I[BDHIMNOTWVYZ]");
IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]"); IBM_BIOS_MODULE_ALIAS("1[0368A-GIKM-PST]");
IBM_BIOS_MODULE_ALIAS("K[U,X-Z]"); IBM_BIOS_MODULE_ALIAS("K[UX-Z]");
MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh"); MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh");
MODULE_DESCRIPTION(TPACPI_DESC); MODULE_DESCRIPTION(TPACPI_DESC);

2
drivers/platform/x86/wmi.c
View File

@ -708,7 +708,7 @@ static int __init acpi_wmi_add(struct acpi_device *device)
static int __init acpi_wmi_init(void) static int __init acpi_wmi_init(void)
{ {
acpi_status result; int result;
INIT_LIST_HEAD(&wmi_blocks.list); INIT_LIST_HEAD(&wmi_blocks.list);