diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-10-03 15:15:40 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-09 20:22:20 -0400 |
commit | 1855256c497ecfefc730df6032243f26855ce52c (patch) | |
tree | b73947f1a5e1b798e1dec068ac1cda25ae910bf6 /drivers/acpi | |
parent | bbf25010f1a6b761914430f5fca081ec8c7accd1 (diff) |
drivers/firmware: const-ify DMI API and internals
Three main sets of changes:
1) dmi_get_system_info() return value should have been marked const,
since callers should not be changing that data.
2) const-ify DMI internals, since DMI firmware tables should,
whenever possible, be marked const to ensure we never ever write to
that data area.
3) const-ify DMI API, to enable marking tables const where possible
in low-level drivers.
And if we're really lucky, this might enable some additional
optimizations on the part of the compiler.
The bulk of the changes are #2 and #3, which are interrelated. #1 could
have been a separate patch, but it was so small compared to the others,
it was easier to roll it into this changeset.
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/osl.c | 2 | ||||
-rw-r--r-- | drivers/acpi/processor_idle.c | 2 | ||||
-rw-r--r-- | drivers/acpi/sleep/main.c | 2 | ||||
-rw-r--r-- | drivers/acpi/thermal.c | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 12c09fafce9a..352cf81af581 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
@@ -1214,7 +1214,7 @@ acpi_os_validate_address ( | |||
1214 | } | 1214 | } |
1215 | 1215 | ||
1216 | #ifdef CONFIG_DMI | 1216 | #ifdef CONFIG_DMI |
1217 | static int dmi_osi_linux(struct dmi_system_id *d) | 1217 | static int dmi_osi_linux(const struct dmi_system_id *d) |
1218 | { | 1218 | { |
1219 | printk(KERN_NOTICE "%s detected: enabling _OSI(Linux)\n", d->ident); | 1219 | printk(KERN_NOTICE "%s detected: enabling _OSI(Linux)\n", d->ident); |
1220 | enable_osi_linux(1); | 1220 | enable_osi_linux(1); |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index f18261368e76..1e8287b4f40c 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -92,7 +92,7 @@ module_param(bm_history, uint, 0644); | |||
92 | * | 92 | * |
93 | * To skip this limit, boot/load with a large max_cstate limit. | 93 | * To skip this limit, boot/load with a large max_cstate limit. |
94 | */ | 94 | */ |
95 | static int set_max_cstate(struct dmi_system_id *id) | 95 | static int set_max_cstate(const struct dmi_system_id *id) |
96 | { | 96 | { |
97 | if (max_cstate > ACPI_PROCESSOR_MAX_POWER) | 97 | if (max_cstate > ACPI_PROCESSOR_MAX_POWER) |
98 | return 0; | 98 | return 0; |
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 2cbb9aabd00e..5055acf2163c 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c | |||
@@ -215,7 +215,7 @@ static struct pm_ops acpi_pm_ops = { | |||
215 | * Toshiba fails to preserve interrupts over S1, reinitialization | 215 | * Toshiba fails to preserve interrupts over S1, reinitialization |
216 | * of 8259 is needed after S1 resume. | 216 | * of 8259 is needed after S1 resume. |
217 | */ | 217 | */ |
218 | static int __init init_ints_after_s1(struct dmi_system_id *d) | 218 | static int __init init_ints_after_s1(const struct dmi_system_id *d) |
219 | { | 219 | { |
220 | printk(KERN_WARNING "%s with broken S1 detected.\n", d->ident); | 220 | printk(KERN_WARNING "%s with broken S1 detected.\n", d->ident); |
221 | init_8259A_after_S1 = 1; | 221 | init_8259A_after_S1 = 1; |
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index bc6d5866ef98..ad898e10c1a9 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
@@ -1360,7 +1360,7 @@ static int acpi_thermal_resume(struct acpi_device *device) | |||
1360 | } | 1360 | } |
1361 | 1361 | ||
1362 | #ifdef CONFIG_DMI | 1362 | #ifdef CONFIG_DMI |
1363 | static int thermal_act(struct dmi_system_id *d) { | 1363 | static int thermal_act(const struct dmi_system_id *d) { |
1364 | 1364 | ||
1365 | if (act == 0) { | 1365 | if (act == 0) { |
1366 | printk(KERN_NOTICE "ACPI: %s detected: " | 1366 | printk(KERN_NOTICE "ACPI: %s detected: " |
@@ -1369,14 +1369,14 @@ static int thermal_act(struct dmi_system_id *d) { | |||
1369 | } | 1369 | } |
1370 | return 0; | 1370 | return 0; |
1371 | } | 1371 | } |
1372 | static int thermal_nocrt(struct dmi_system_id *d) { | 1372 | static int thermal_nocrt(const struct dmi_system_id *d) { |
1373 | 1373 | ||
1374 | printk(KERN_NOTICE "ACPI: %s detected: " | 1374 | printk(KERN_NOTICE "ACPI: %s detected: " |
1375 | "disabling all critical thermal trip point actions.\n", d->ident); | 1375 | "disabling all critical thermal trip point actions.\n", d->ident); |
1376 | nocrt = 1; | 1376 | nocrt = 1; |
1377 | return 0; | 1377 | return 0; |
1378 | } | 1378 | } |
1379 | static int thermal_tzp(struct dmi_system_id *d) { | 1379 | static int thermal_tzp(const struct dmi_system_id *d) { |
1380 | 1380 | ||
1381 | if (tzp == 0) { | 1381 | if (tzp == 0) { |
1382 | printk(KERN_NOTICE "ACPI: %s detected: " | 1382 | printk(KERN_NOTICE "ACPI: %s detected: " |
@@ -1385,7 +1385,7 @@ static int thermal_tzp(struct dmi_system_id *d) { | |||
1385 | } | 1385 | } |
1386 | return 0; | 1386 | return 0; |
1387 | } | 1387 | } |
1388 | static int thermal_psv(struct dmi_system_id *d) { | 1388 | static int thermal_psv(const struct dmi_system_id *d) { |
1389 | 1389 | ||
1390 | if (psv == 0) { | 1390 | if (psv == 0) { |
1391 | printk(KERN_NOTICE "ACPI: %s detected: " | 1391 | printk(KERN_NOTICE "ACPI: %s detected: " |