Commit 86872310 authored by Len Brown's avatar Len Brown

Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.1

into intel.com:/home/lenb/src/linux-acpi-test-2.6.2
parents ebaef79a 573d821f
...@@ -307,7 +307,7 @@ loader_ok: ...@@ -307,7 +307,7 @@ loader_ok:
# a whole bunch of different types, and allows memory holes and # a whole bunch of different types, and allows memory holes and
# everything. We scan through this memory map and build a list # everything. We scan through this memory map and build a list
# of the first 32 memory areas, which we return at [E820MAP]. # of the first 32 memory areas, which we return at [E820MAP].
# This is documented at http://www.teleport.com/~acpi/acpihtml/topic245.htm # This is documented at http://www.acpi.info/, in the ACPI 2.0 specification.
#define SMAP 0x534d4150 #define SMAP 0x534d4150
......
...@@ -108,7 +108,7 @@ acpi_ac_get_state ( ...@@ -108,7 +108,7 @@ acpi_ac_get_state (
FS Interface (/proc) FS Interface (/proc)
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
struct proc_dir_entry *acpi_ac_dir = NULL; struct proc_dir_entry *acpi_ac_dir;
int acpi_ac_seq_show(struct seq_file *seq, void *offset) int acpi_ac_seq_show(struct seq_file *seq, void *offset)
{ {
......
...@@ -73,8 +73,8 @@ MODULE_DESCRIPTION(ACPI_HOTK_NAME); ...@@ -73,8 +73,8 @@ MODULE_DESCRIPTION(ACPI_HOTK_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static uid_t asus_uid = 0; static uid_t asus_uid;
static gid_t asus_gid = 0; static gid_t asus_gid;
MODULE_PARM(asus_uid, "i"); MODULE_PARM(asus_uid, "i");
MODULE_PARM_DESC(uid, "UID for entries in /proc/acpi/asus.\n"); MODULE_PARM_DESC(uid, "UID for entries in /proc/acpi/asus.\n");
MODULE_PARM(asus_gid, "i"); MODULE_PARM(asus_gid, "i");
...@@ -192,14 +192,14 @@ static struct model_data model_conf[END_MODEL] = { ...@@ -192,14 +192,14 @@ static struct model_data model_conf[END_MODEL] = {
}; };
/* procdir we use */ /* procdir we use */
static struct proc_dir_entry *asus_proc_dir = NULL; static struct proc_dir_entry *asus_proc_dir;
/* /*
* This header is made available to allow proper configuration given model, * This header is made available to allow proper configuration given model,
* revision number , ... this info cannot go in struct asus_hotk because it is * revision number , ... this info cannot go in struct asus_hotk because it is
* available before the hotk * available before the hotk
*/ */
static struct acpi_table_header *asus_info = NULL; static struct acpi_table_header *asus_info;
/* /*
* The hotkey driver declaration * The hotkey driver declaration
......
...@@ -340,7 +340,7 @@ acpi_battery_check ( ...@@ -340,7 +340,7 @@ acpi_battery_check (
FS Interface (/proc) FS Interface (/proc)
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
struct proc_dir_entry *acpi_battery_dir = NULL; struct proc_dir_entry *acpi_battery_dir;
static int static int
acpi_battery_read_info ( acpi_battery_read_info (
......
...@@ -107,7 +107,7 @@ static struct file_operations acpi_button_state_fops = { ...@@ -107,7 +107,7 @@ static struct file_operations acpi_button_state_fops = {
FS Interface (/proc) FS Interface (/proc)
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
static struct proc_dir_entry *acpi_button_dir = NULL; static struct proc_dir_entry *acpi_button_dir;
static int acpi_button_info_seq_show(struct seq_file *seq, void *offset) static int acpi_button_info_seq_show(struct seq_file *seq, void *offset)
{ {
......
...@@ -475,7 +475,7 @@ acpi_ec_space_handler ( ...@@ -475,7 +475,7 @@ acpi_ec_space_handler (
FS Interface (/proc) FS Interface (/proc)
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
struct proc_dir_entry *acpi_ec_dir = NULL; struct proc_dir_entry *acpi_ec_dir;
static int static int
......
...@@ -71,7 +71,7 @@ struct acpi_fan { ...@@ -71,7 +71,7 @@ struct acpi_fan {
FS Interface (/proc) FS Interface (/proc)
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
struct proc_dir_entry *acpi_fan_dir = NULL; struct proc_dir_entry *acpi_fan_dir;
static int static int
......
...@@ -59,13 +59,13 @@ struct acpi_os_dpc ...@@ -59,13 +59,13 @@ struct acpi_os_dpc
#ifdef ENABLE_DEBUGGER #ifdef ENABLE_DEBUGGER
#include <linux/kdb.h> #include <linux/kdb.h>
/* stuff for debugger support */ /* stuff for debugger support */
int acpi_in_debugger = 0; int acpi_in_debugger;
extern char line_buf[80]; extern char line_buf[80];
#endif /*ENABLE_DEBUGGER*/ #endif /*ENABLE_DEBUGGER*/
static int acpi_irq_irq = 0; static int acpi_irq_irq;
static OSD_HANDLER acpi_irq_handler = NULL; static OSD_HANDLER acpi_irq_handler;
static void *acpi_irq_context = NULL; static void *acpi_irq_context;
acpi_status acpi_status
acpi_os_initialize(void) acpi_os_initialize(void)
...@@ -257,13 +257,13 @@ acpi_os_install_interrupt_handler(u32 irq, OSD_HANDLER handler, void *context) ...@@ -257,13 +257,13 @@ acpi_os_install_interrupt_handler(u32 irq, OSD_HANDLER handler, void *context)
return AE_OK; return AE_OK;
} }
#endif #endif
acpi_irq_irq = irq;
acpi_irq_handler = handler; acpi_irq_handler = handler;
acpi_irq_context = context; acpi_irq_context = context;
if (request_irq(irq, acpi_irq, SA_SHIRQ, "acpi", acpi_irq)) { if (request_irq(irq, acpi_irq, SA_SHIRQ, "acpi", acpi_irq)) {
printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq); printk(KERN_ERR PREFIX "SCI (IRQ%d) allocation failed\n", irq);
return AE_NOT_ACQUIRED; return AE_NOT_ACQUIRED;
} }
acpi_irq_irq = irq;
return AE_OK; return AE_OK;
} }
...@@ -271,12 +271,13 @@ acpi_os_install_interrupt_handler(u32 irq, OSD_HANDLER handler, void *context) ...@@ -271,12 +271,13 @@ acpi_os_install_interrupt_handler(u32 irq, OSD_HANDLER handler, void *context)
acpi_status acpi_status
acpi_os_remove_interrupt_handler(u32 irq, OSD_HANDLER handler) acpi_os_remove_interrupt_handler(u32 irq, OSD_HANDLER handler)
{ {
if (acpi_irq_handler) { if (irq) {
#ifdef CONFIG_IA64 #ifdef CONFIG_IA64
irq = acpi_irq_to_vector(irq); irq = acpi_irq_to_vector(irq);
#endif #endif
free_irq(irq, acpi_irq); free_irq(irq, acpi_irq);
acpi_irq_handler = NULL; acpi_irq_handler = NULL;
acpi_irq_irq = 0;
} }
return AE_OK; return AE_OK;
......
...@@ -387,7 +387,7 @@ acpi_power_transition ( ...@@ -387,7 +387,7 @@ acpi_power_transition (
FS Interface (/proc) FS Interface (/proc)
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
struct proc_dir_entry *acpi_power_dir = NULL; struct proc_dir_entry *acpi_power_dir;
static int acpi_power_seq_show(struct seq_file *seq, void *offset) static int acpi_power_seq_show(struct seq_file *seq, void *offset)
{ {
......
...@@ -138,7 +138,7 @@ static struct file_operations acpi_processor_limit_fops = { ...@@ -138,7 +138,7 @@ static struct file_operations acpi_processor_limit_fops = {
static struct acpi_processor *processors[NR_CPUS]; static struct acpi_processor *processors[NR_CPUS];
static struct acpi_processor_errata errata; static struct acpi_processor_errata errata;
static void (*pm_idle_save)(void) = NULL; static void (*pm_idle_save)(void);
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
......
...@@ -706,11 +706,11 @@ acpi_bus_add ( ...@@ -706,11 +706,11 @@ acpi_bus_add (
switch (type) { switch (type) {
case ACPI_BUS_TYPE_DEVICE: case ACPI_BUS_TYPE_DEVICE:
result = acpi_bus_get_status(device); result = acpi_bus_get_status(device);
if (!result) if (ACPI_FAILURE(result) || !device->status.present) {
break;
if (!device->status.present)
result = -ENOENT; result = -ENOENT;
goto end; goto end;
}
break;
default: default:
STRUCT_TO_INT(device->status) = 0x0F; STRUCT_TO_INT(device->status) = 0x0F;
break; break;
......
...@@ -276,10 +276,17 @@ acpi_get_table_header_early ( ...@@ -276,10 +276,17 @@ acpi_get_table_header_early (
/* Map the DSDT header via the pointer in the FADT */ /* Map the DSDT header via the pointer in the FADT */
if (id == ACPI_DSDT) { if (id == ACPI_DSDT) {
struct acpi_table_fadt *fadt = (struct acpi_table_fadt *) *header; struct fadt_descriptor_rev2 *fadt = (struct fadt_descriptor_rev2 *) *header;
*header = (void *) __acpi_map_table(fadt->dsdt_addr, if (fadt->revision == 3 && fadt->Xdsdt) {
*header = (void *) __acpi_map_table(fadt->Xdsdt,
sizeof(struct acpi_table_header)); sizeof(struct acpi_table_header));
} else if (fadt->V1_dsdt) {
*header = (void *) __acpi_map_table(fadt->V1_dsdt,
sizeof(struct acpi_table_header));
} else
*header = 0;
if (!*header) { if (!*header) {
printk(KERN_WARNING PREFIX "Unable to map DSDT\n"); printk(KERN_WARNING PREFIX "Unable to map DSDT\n");
return -ENODEV; return -ENODEV;
......
...@@ -74,7 +74,7 @@ MODULE_AUTHOR("Paul Diefenbaugh"); ...@@ -74,7 +74,7 @@ MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION(ACPI_THERMAL_DRIVER_NAME); MODULE_DESCRIPTION(ACPI_THERMAL_DRIVER_NAME);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int tzp = 0; static int tzp;
MODULE_PARM(tzp, "i"); MODULE_PARM(tzp, "i");
MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.\n"); MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.\n");
...@@ -766,7 +766,7 @@ acpi_thermal_check ( ...@@ -766,7 +766,7 @@ acpi_thermal_check (
FS Interface (/proc) FS Interface (/proc)
-------------------------------------------------------------------------- */ -------------------------------------------------------------------------- */
struct proc_dir_entry *acpi_thermal_dir = NULL; struct proc_dir_entry *acpi_thermal_dir;
static int acpi_thermal_state_seq_show(struct seq_file *seq, void *offset) static int acpi_thermal_state_seq_show(struct seq_file *seq, void *offset)
{ {
......
...@@ -215,7 +215,7 @@ hci_read1(u32 reg, u32* out1, u32* result) ...@@ -215,7 +215,7 @@ hci_read1(u32 reg, u32* out1, u32* result)
return status; return status;
} }
static struct proc_dir_entry* toshiba_proc_dir = NULL; static struct proc_dir_entry* toshiba_proc_dir;
static int force_fan; static int force_fan;
static int last_key_event; static int last_key_event;
static int key_event_valid; static int key_event_valid;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment