diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/Kconfig | 2 | ||||
-rw-r--r-- | drivers/acpi/acpica/hwxface.c | 2 | ||||
-rw-r--r-- | drivers/acpi/apei/erst.c | 6 | ||||
-rw-r--r-- | drivers/acpi/battery.c | 2 | ||||
-rw-r--r-- | drivers/acpi/ec_sys.c | 2 | ||||
-rw-r--r-- | drivers/acpi/processor_driver.c | 6 | ||||
-rw-r--r-- | drivers/acpi/processor_thermal.c | 1 | ||||
-rw-r--r-- | drivers/acpi/sleep.c | 16 |
8 files changed, 27 insertions, 10 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index de0e3df7677..7556913aba4 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -374,7 +374,7 @@ config ACPI_CUSTOM_METHOD | |||
374 | depends on DEBUG_FS | 374 | depends on DEBUG_FS |
375 | default n | 375 | default n |
376 | help | 376 | help |
377 | This debug facility allows ACPI AML methods to me inserted and/or | 377 | This debug facility allows ACPI AML methods to be inserted and/or |
378 | replaced without rebooting the system. For details refer to: | 378 | replaced without rebooting the system. For details refer to: |
379 | Documentation/acpi/method-customizing.txt. | 379 | Documentation/acpi/method-customizing.txt. |
380 | 380 | ||
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c index c2793a82f12..d707756228c 100644 --- a/drivers/acpi/acpica/hwxface.c +++ b/drivers/acpi/acpica/hwxface.c | |||
@@ -356,7 +356,7 @@ ACPI_EXPORT_SYMBOL(acpi_read_bit_register) | |||
356 | * | 356 | * |
357 | * PARAMETERS: register_id - ID of ACPI Bit Register to access | 357 | * PARAMETERS: register_id - ID of ACPI Bit Register to access |
358 | * Value - Value to write to the register, in bit | 358 | * Value - Value to write to the register, in bit |
359 | * position zero. The bit is automaticallly | 359 | * position zero. The bit is automatically |
360 | * shifted to the correct position. | 360 | * shifted to the correct position. |
361 | * | 361 | * |
362 | * RETURN: Status | 362 | * RETURN: Status |
diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c index 631b9477b99..6a9e3bad13f 100644 --- a/drivers/acpi/apei/erst.c +++ b/drivers/acpi/apei/erst.c | |||
@@ -934,7 +934,8 @@ static int erst_close_pstore(struct pstore_info *psi); | |||
934 | static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, | 934 | static ssize_t erst_reader(u64 *id, enum pstore_type_id *type, |
935 | struct timespec *time, char **buf, | 935 | struct timespec *time, char **buf, |
936 | struct pstore_info *psi); | 936 | struct pstore_info *psi); |
937 | static int erst_writer(enum pstore_type_id type, u64 *id, unsigned int part, | 937 | static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason, |
938 | u64 *id, unsigned int part, | ||
938 | size_t size, struct pstore_info *psi); | 939 | size_t size, struct pstore_info *psi); |
939 | static int erst_clearer(enum pstore_type_id type, u64 id, | 940 | static int erst_clearer(enum pstore_type_id type, u64 id, |
940 | struct pstore_info *psi); | 941 | struct pstore_info *psi); |
@@ -1053,7 +1054,8 @@ out: | |||
1053 | return (rc < 0) ? rc : (len - sizeof(*rcd)); | 1054 | return (rc < 0) ? rc : (len - sizeof(*rcd)); |
1054 | } | 1055 | } |
1055 | 1056 | ||
1056 | static int erst_writer(enum pstore_type_id type, u64 *id, unsigned int part, | 1057 | static int erst_writer(enum pstore_type_id type, enum kmsg_dump_reason reason, |
1058 | u64 *id, unsigned int part, | ||
1057 | size_t size, struct pstore_info *psi) | 1059 | size_t size, struct pstore_info *psi) |
1058 | { | 1060 | { |
1059 | struct cper_pstore_record *rcd = (struct cper_pstore_record *) | 1061 | struct cper_pstore_record *rcd = (struct cper_pstore_record *) |
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 7711d94a040..86933ca8b47 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
@@ -873,7 +873,7 @@ DECLARE_FILE_FUNCTIONS(alarm); | |||
873 | 873 | ||
874 | static const struct battery_file { | 874 | static const struct battery_file { |
875 | struct file_operations ops; | 875 | struct file_operations ops; |
876 | mode_t mode; | 876 | umode_t mode; |
877 | const char *name; | 877 | const char *name; |
878 | } acpi_battery_file[] = { | 878 | } acpi_battery_file[] = { |
879 | FILE_DESCRIPTION_RO(info), | 879 | FILE_DESCRIPTION_RO(info), |
diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c index 6c47ae9793a..b258cab9061 100644 --- a/drivers/acpi/ec_sys.c +++ b/drivers/acpi/ec_sys.c | |||
@@ -105,7 +105,7 @@ int acpi_ec_add_debugfs(struct acpi_ec *ec, unsigned int ec_device_count) | |||
105 | { | 105 | { |
106 | struct dentry *dev_dir; | 106 | struct dentry *dev_dir; |
107 | char name[64]; | 107 | char name[64]; |
108 | mode_t mode = 0400; | 108 | umode_t mode = 0400; |
109 | 109 | ||
110 | if (ec_device_count == 0) { | 110 | if (ec_device_count == 0) { |
111 | acpi_ec_debugfs_dir = debugfs_create_dir("ec", NULL); | 111 | acpi_ec_debugfs_dir = debugfs_create_dir("ec", NULL); |
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index 9d7bc9f6b6c..20a68ca386d 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c | |||
@@ -446,7 +446,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) | |||
446 | { | 446 | { |
447 | struct acpi_processor *pr = NULL; | 447 | struct acpi_processor *pr = NULL; |
448 | int result = 0; | 448 | int result = 0; |
449 | struct sys_device *sysdev; | 449 | struct device *dev; |
450 | 450 | ||
451 | pr = kzalloc(sizeof(struct acpi_processor), GFP_KERNEL); | 451 | pr = kzalloc(sizeof(struct acpi_processor), GFP_KERNEL); |
452 | if (!pr) | 452 | if (!pr) |
@@ -491,8 +491,8 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) | |||
491 | 491 | ||
492 | per_cpu(processors, pr->id) = pr; | 492 | per_cpu(processors, pr->id) = pr; |
493 | 493 | ||
494 | sysdev = get_cpu_sysdev(pr->id); | 494 | dev = get_cpu_device(pr->id); |
495 | if (sysfs_create_link(&device->dev.kobj, &sysdev->kobj, "sysdev")) { | 495 | if (sysfs_create_link(&device->dev.kobj, &dev->kobj, "sysdev")) { |
496 | result = -EFAULT; | 496 | result = -EFAULT; |
497 | goto err_free_cpumask; | 497 | goto err_free_cpumask; |
498 | } | 498 | } |
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index 870550d6a4b..3b599abf2b4 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
32 | #include <linux/cpufreq.h> | 32 | #include <linux/cpufreq.h> |
33 | #include <linux/sysdev.h> | ||
34 | 33 | ||
35 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
36 | 35 | ||
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 6d9a3ab58db..0a7ed69546b 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -476,6 +476,22 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { | |||
476 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"), | 476 | DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW520F"), |
477 | }, | 477 | }, |
478 | }, | 478 | }, |
479 | { | ||
480 | .callback = init_nvs_nosave, | ||
481 | .ident = "Asus K54C", | ||
482 | .matches = { | ||
483 | DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), | ||
484 | DMI_MATCH(DMI_PRODUCT_NAME, "K54C"), | ||
485 | }, | ||
486 | }, | ||
487 | { | ||
488 | .callback = init_nvs_nosave, | ||
489 | .ident = "Asus K54HR", | ||
490 | .matches = { | ||
491 | DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), | ||
492 | DMI_MATCH(DMI_PRODUCT_NAME, "K54HR"), | ||
493 | }, | ||
494 | }, | ||
479 | {}, | 495 | {}, |
480 | }; | 496 | }; |
481 | #endif /* CONFIG_SUSPEND */ | 497 | #endif /* CONFIG_SUSPEND */ |