diff options
author | Len Brown <len.brown@intel.com> | 2007-02-03 02:13:53 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-03 02:13:53 -0500 |
commit | 894d79bedd8b48fe838083f2d2a42ac09817c530 (patch) | |
tree | e277432888ab3919fc5edebdeb9680c01a7e3259 | |
parent | 274ec7a8c07036bd02e8f2301456e443ef30b8a8 (diff) |
asus-laptop: merge with ACPICA table update
No longer need a buffer for a copy of the DSDT,
just a pointer to the mapped table.
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/misc/asus-laptop.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/misc/asus-laptop.c b/drivers/misc/asus-laptop.c index b6243506add8..861c39935f99 100644 --- a/drivers/misc/asus-laptop.c +++ b/drivers/misc/asus-laptop.c | |||
@@ -777,7 +777,6 @@ static int asus_handle_init(char *name, acpi_handle * handle, | |||
777 | static int asus_hotk_get_info(void) | 777 | static int asus_hotk_get_info(void) |
778 | { | 778 | { |
779 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; | 779 | struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; |
780 | struct acpi_buffer dsdt = { ACPI_ALLOCATE_BUFFER, NULL }; | ||
781 | union acpi_object *model = NULL; | 780 | union acpi_object *model = NULL; |
782 | int bsts_result, hwrs_result; | 781 | int bsts_result, hwrs_result; |
783 | char *string = NULL; | 782 | char *string = NULL; |
@@ -791,11 +790,9 @@ static int asus_hotk_get_info(void) | |||
791 | * HID), this bit will be moved. A global variable asus_info contains | 790 | * HID), this bit will be moved. A global variable asus_info contains |
792 | * the DSDT header. | 791 | * the DSDT header. |
793 | */ | 792 | */ |
794 | status = acpi_get_table(ACPI_TABLE_ID_DSDT, 1, &dsdt); | 793 | status = acpi_get_table(ACPI_SIG_DSDT, 1, &asus_info); |
795 | if (ACPI_FAILURE(status)) | 794 | if (ACPI_FAILURE(status)) |
796 | printk(ASUS_WARNING "Couldn't get the DSDT table header\n"); | 795 | printk(ASUS_WARNING "Couldn't get the DSDT table header\n"); |
797 | else | ||
798 | asus_info = dsdt.pointer; | ||
799 | 796 | ||
800 | /* We have to write 0 on init this far for all ASUS models */ | 797 | /* We have to write 0 on init this far for all ASUS models */ |
801 | if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) { | 798 | if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) { |
@@ -1014,8 +1011,6 @@ static void __exit asus_laptop_exit(void) | |||
1014 | sysfs_remove_group(&asuspf_device->dev.kobj, &asuspf_attribute_group); | 1011 | sysfs_remove_group(&asuspf_device->dev.kobj, &asuspf_attribute_group); |
1015 | platform_device_unregister(asuspf_device); | 1012 | platform_device_unregister(asuspf_device); |
1016 | platform_driver_unregister(&asuspf_driver); | 1013 | platform_driver_unregister(&asuspf_driver); |
1017 | |||
1018 | kfree(asus_info); | ||
1019 | } | 1014 | } |
1020 | 1015 | ||
1021 | static int asus_backlight_init(struct device *dev) | 1016 | static int asus_backlight_init(struct device *dev) |