Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pull trivial1 into release branch

Browse source
This commit is contained in:
Len Brown 2006-06-15 15:37:09 -04:00
commit 63518472c0
6 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/acpi/asus_acpi.c
View file

@ -817,7 +817,7 @@ typedef int (proc_writefunc) (struct file * file, const char __user * buffer,
unsigned long count, void *data); unsigned long count, void *data);
static int static int
__init asus_proc_add(char *name, proc_writefunc * writefunc, asus_proc_add(char *name, proc_writefunc * writefunc,
proc_readfunc * readfunc, mode_t mode, proc_readfunc * readfunc, mode_t mode,
struct acpi_device *device) struct acpi_device *device)
{ {
@ -836,7 +836,7 @@ __init asus_proc_add(char *name, proc_writefunc * writefunc,
return 0; return 0;
} }
static int __init asus_hotk_add_fs(struct acpi_device *device) static int asus_hotk_add_fs(struct acpi_device *device)
{ {
struct proc_dir_entry *proc; struct proc_dir_entry *proc;
mode_t mode; mode_t mode;
@ -954,7 +954,7 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
* This function is used to initialize the hotk with right values. In this * This function is used to initialize the hotk with right values. In this
* method, we can make all the detection we want, and modify the hotk struct * method, we can make all the detection we want, and modify the hotk struct
*/ */
static int __init asus_hotk_get_info(void) static int asus_hotk_get_info(void)
{ {
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL };
@ -1101,7 +1101,7 @@ static int __init asus_hotk_get_info(void)
return AE_OK; return AE_OK;
} }
static int __init asus_hotk_check(void) static int asus_hotk_check(void)
{ {
int result = 0; int result = 0;
@ -1119,7 +1119,7 @@ static int __init asus_hotk_check(void)
return result; return result;
} }
static int __init asus_hotk_add(struct acpi_device *device) static int asus_hotk_add(struct acpi_device *device)
{ {
acpi_status status = AE_OK; acpi_status status = AE_OK;
int result; int result;

10
drivers/acpi/processor_core.c
View file

@ -388,7 +388,7 @@ static int acpi_processor_remove_fs(struct acpi_device *device)
/* Use the acpiid in MADT to map cpus in case of SMP */ /* Use the acpiid in MADT to map cpus in case of SMP */
#ifndef CONFIG_SMP #ifndef CONFIG_SMP
#define convert_acpiid_to_cpu(acpi_id) (0xff) #define convert_acpiid_to_cpu(acpi_id) (-1)
#else #else
#ifdef CONFIG_IA64 #ifdef CONFIG_IA64
@ -401,7 +401,7 @@ static int acpi_processor_remove_fs(struct acpi_device *device)
#define ARCH_BAD_APICID (0xff) #define ARCH_BAD_APICID (0xff)
#endif #endif
static u8 convert_acpiid_to_cpu(u8 acpi_id) static int convert_acpiid_to_cpu(u8 acpi_id)
{ {
u16 apic_id; u16 apic_id;
int i; int i;
@ -427,7 +427,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
acpi_status status = 0; acpi_status status = 0;
union acpi_object object = { 0 }; union acpi_object object = { 0 };
struct acpi_buffer buffer = { sizeof(union acpi_object), &object }; struct acpi_buffer buffer = { sizeof(union acpi_object), &object };
u8 cpu_index; int cpu_index;
static int cpu0_initialized; static int cpu0_initialized;
ACPI_FUNCTION_TRACE("acpi_processor_get_info"); ACPI_FUNCTION_TRACE("acpi_processor_get_info");
@ -473,7 +473,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
cpu_index = convert_acpiid_to_cpu(pr->acpi_id); cpu_index = convert_acpiid_to_cpu(pr->acpi_id);
/* Handle UP system running SMP kernel, with no LAPIC in MADT */ /* Handle UP system running SMP kernel, with no LAPIC in MADT */
if (!cpu0_initialized && (cpu_index == 0xff) && if (!cpu0_initialized && (cpu_index == -1) &&
(num_online_cpus() == 1)) { (num_online_cpus() == 1)) {
cpu_index = 0; cpu_index = 0;
} }
@ -487,7 +487,7 @@ static int acpi_processor_get_info(struct acpi_processor *pr)
* less than the max # of CPUs. They should be ignored _iff * less than the max # of CPUs. They should be ignored _iff
* they are physically not present. * they are physically not present.
*/ */
if (cpu_index >= NR_CPUS) { if (cpu_index == -1) {
if (ACPI_FAILURE if (ACPI_FAILURE
(acpi_processor_hotadd_init(pr->handle, &pr->id))) { (acpi_processor_hotadd_init(pr->handle, &pr->id))) {
ACPI_DEBUG_PRINT((ACPI_DB_ERROR, ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

36
drivers/acpi/scan.c
View file

@ -234,12 +234,9 @@ static int acpi_bus_get_power_flags(struct acpi_device *device)
int acpi_match_ids(struct acpi_device *device, char *ids) int acpi_match_ids(struct acpi_device *device, char *ids)
{ {
int error = 0;
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
if (device->flags.hardware_id) if (device->flags.hardware_id)
if (strstr(ids, device->pnp.hardware_id)) if (strstr(ids, device->pnp.hardware_id))
goto Done; return 0;
if (device->flags.compatible_ids) { if (device->flags.compatible_ids) {
struct acpi_compatible_id_list *cid_list = device->pnp.cid_list; struct acpi_compatible_id_list *cid_list = device->pnp.cid_list;
@ -248,15 +245,10 @@ int acpi_match_ids(struct acpi_device *device, char *ids)
/* compare multiple _CID entries against driver ids */ /* compare multiple _CID entries against driver ids */
for (i = 0; i < cid_list->count; i++) { for (i = 0; i < cid_list->count; i++) {
if (strstr(ids, cid_list->id[i].value)) if (strstr(ids, cid_list->id[i].value))
goto Done; return 0;
} }
} }
error = -ENOENT; return -ENOENT;
Done:
if (buffer.pointer)
acpi_os_free(buffer.pointer);
return error;
} }
static acpi_status static acpi_status
@ -642,21 +634,19 @@ EXPORT_SYMBOL(acpi_bus_register_driver);
*/ */
int acpi_bus_unregister_driver(struct acpi_driver *driver) int acpi_bus_unregister_driver(struct acpi_driver *driver)
{ {
int error = 0;
ACPI_FUNCTION_TRACE("acpi_bus_unregister_driver"); ACPI_FUNCTION_TRACE("acpi_bus_unregister_driver");
if (driver) { if (!driver)
acpi_driver_detach(driver); return_VALUE(-EINVAL);
if (!atomic_read(&driver->references)) { acpi_driver_detach(driver);
spin_lock(&acpi_device_lock);
list_del_init(&driver->node); if (!atomic_read(&driver->references)) {
spin_unlock(&acpi_device_lock); spin_lock(&acpi_device_lock);
} list_del_init(&driver->node);
} else spin_unlock(&acpi_device_lock);
error = -EINVAL; }
return_VALUE(error); return_VALUE(0);
} }
EXPORT_SYMBOL(acpi_bus_unregister_driver); EXPORT_SYMBOL(acpi_bus_unregister_driver);

3
drivers/acpi/sleep/wakeup.c
View file

@ -155,7 +155,6 @@ static int __init acpi_wakeup_device_init(void)
if (acpi_disabled) if (acpi_disabled)
return 0; return 0;
printk("ACPI wakeup devices: \n");
spin_lock(&acpi_device_lock); spin_lock(&acpi_device_lock);
list_for_each_safe(node, next, &acpi_wakeup_device_list) { list_for_each_safe(node, next, &acpi_wakeup_device_list) {
@ -174,10 +173,8 @@ static int __init acpi_wakeup_device_init(void)
dev->wakeup.state.enabled = 1; dev->wakeup.state.enabled = 1;
spin_lock(&acpi_device_lock); spin_lock(&acpi_device_lock);
} }
printk("%4s ", dev->pnp.bus_id);
} }
spin_unlock(&acpi_device_lock); spin_unlock(&acpi_device_lock);
printk("\n");
return 0; return 0;
} }

1
include/asm-i386/apicdef.h
View file

@ -121,7 +121,6 @@
*/ */
#define u32 unsigned int #define u32 unsigned int
#define lapic ((volatile struct local_apic *)APIC_BASE)
struct local_apic { struct local_apic {

2
include/asm-x86_64/apicdef.h
View file

@ -137,8 +137,6 @@
*/ */
#define u32 unsigned int #define u32 unsigned int
#define lapic ((volatile struct local_apic *)APIC_BASE)
struct local_apic { struct local_apic {
/*000*/ struct { u32 __reserved[4]; } __reserved_01; /*000*/ struct { u32 __reserved[4]; } __reserved_01;