diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-22 21:46:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-22 21:46:56 -0500 |
commit | 18ed1c051317ac3a685120cead2adb192b802347 (patch) | |
tree | c08a9147119a6cb69114166c7107f6b0bba6e2ab /drivers/acpi/processor_idle.c | |
parent | dab6df63086762629936e8b89a5984bae39724f6 (diff) | |
parent | 36bcbec7ce21e2e8b3143b11a05747330abeca70 (diff) |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (68 commits)
ACPI: replace kmalloc+memset with kzalloc
ACPI: Add support for acpi_load_table/acpi_unload_table_id
fbdev: update after backlight argument change
ACPI: video: Add dev argument for backlight_device_register
ACPI: Implement acpi_video_get_next_level()
ACPI: Kconfig - depend on PM rather than selecting it
ACPI: fix NULL check in drivers/acpi/osl.c
ACPI: make drivers/acpi/ec.c:ec_ecdt static
ACPI: prevent processor module from loading on failures
ACPI: fix single linked list manipulation
ACPI: ibm_acpi: allow clean removal
ACPI: fix git automerge failure
ACPI: ibm_acpi: respond to workqueue update
ACPI: dock: add uevent to indicate change in device status
ACPI: ec: Lindent once again
ACPI: ec: Change #define to enums there possible.
ACPI: ec: Style changes.
ACPI: ec: Acquire Global Lock under EC mutex.
ACPI: ec: Drop udelay() from poll mode. Loop by reading status field instead.
ACPI: ec: Rename gpe_bit to gpe
...
Diffstat (limited to 'drivers/acpi/processor_idle.c')
-rw-r--r-- | drivers/acpi/processor_idle.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 6dac6050bb5a..3f30af21574e 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -681,7 +681,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) | |||
681 | return -ENODEV; | 681 | return -ENODEV; |
682 | } | 682 | } |
683 | 683 | ||
684 | cst = (union acpi_object *)buffer.pointer; | 684 | cst = buffer.pointer; |
685 | 685 | ||
686 | /* There must be at least 2 elements */ | 686 | /* There must be at least 2 elements */ |
687 | if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) { | 687 | if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) { |
@@ -710,14 +710,14 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) | |||
710 | 710 | ||
711 | memset(&cx, 0, sizeof(cx)); | 711 | memset(&cx, 0, sizeof(cx)); |
712 | 712 | ||
713 | element = (union acpi_object *)&(cst->package.elements[i]); | 713 | element = &(cst->package.elements[i]); |
714 | if (element->type != ACPI_TYPE_PACKAGE) | 714 | if (element->type != ACPI_TYPE_PACKAGE) |
715 | continue; | 715 | continue; |
716 | 716 | ||
717 | if (element->package.count != 4) | 717 | if (element->package.count != 4) |
718 | continue; | 718 | continue; |
719 | 719 | ||
720 | obj = (union acpi_object *)&(element->package.elements[0]); | 720 | obj = &(element->package.elements[0]); |
721 | 721 | ||
722 | if (obj->type != ACPI_TYPE_BUFFER) | 722 | if (obj->type != ACPI_TYPE_BUFFER) |
723 | continue; | 723 | continue; |
@@ -729,7 +729,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) | |||
729 | continue; | 729 | continue; |
730 | 730 | ||
731 | /* There should be an easy way to extract an integer... */ | 731 | /* There should be an easy way to extract an integer... */ |
732 | obj = (union acpi_object *)&(element->package.elements[1]); | 732 | obj = &(element->package.elements[1]); |
733 | if (obj->type != ACPI_TYPE_INTEGER) | 733 | if (obj->type != ACPI_TYPE_INTEGER) |
734 | continue; | 734 | continue; |
735 | 735 | ||
@@ -762,13 +762,13 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr) | |||
762 | } | 762 | } |
763 | } | 763 | } |
764 | 764 | ||
765 | obj = (union acpi_object *)&(element->package.elements[2]); | 765 | obj = &(element->package.elements[2]); |
766 | if (obj->type != ACPI_TYPE_INTEGER) | 766 | if (obj->type != ACPI_TYPE_INTEGER) |
767 | continue; | 767 | continue; |
768 | 768 | ||
769 | cx.latency = obj->integer.value; | 769 | cx.latency = obj->integer.value; |
770 | 770 | ||
771 | obj = (union acpi_object *)&(element->package.elements[3]); | 771 | obj = &(element->package.elements[3]); |
772 | if (obj->type != ACPI_TYPE_INTEGER) | 772 | if (obj->type != ACPI_TYPE_INTEGER) |
773 | continue; | 773 | continue; |
774 | 774 | ||
@@ -1037,7 +1037,7 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) | |||
1037 | 1037 | ||
1038 | static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset) | 1038 | static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset) |
1039 | { | 1039 | { |
1040 | struct acpi_processor *pr = (struct acpi_processor *)seq->private; | 1040 | struct acpi_processor *pr = seq->private; |
1041 | unsigned int i; | 1041 | unsigned int i; |
1042 | 1042 | ||
1043 | 1043 | ||