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/misc | |
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/misc')
-rw-r--r-- | drivers/misc/msi-laptop.c | 2 | ||||
-rw-r--r-- | drivers/misc/sony-laptop.c | 4 | ||||
-rw-r--r-- | drivers/misc/thinkpad_acpi.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/msi-laptop.c b/drivers/misc/msi-laptop.c index 349be934db7c..83679c762925 100644 --- a/drivers/misc/msi-laptop.c +++ b/drivers/misc/msi-laptop.c | |||
@@ -283,7 +283,7 @@ static struct platform_device *msipf_device; | |||
283 | 283 | ||
284 | /* Initialization */ | 284 | /* Initialization */ |
285 | 285 | ||
286 | static int dmi_check_cb(struct dmi_system_id *id) | 286 | static int dmi_check_cb(const struct dmi_system_id *id) |
287 | { | 287 | { |
288 | printk("msi-laptop: Identified laptop model '%s'.\n", id->ident); | 288 | printk("msi-laptop: Identified laptop model '%s'.\n", id->ident); |
289 | return 0; | 289 | return 0; |
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c index d38ddce592c0..e73a71f04bb4 100644 --- a/drivers/misc/sony-laptop.c +++ b/drivers/misc/sony-laptop.c | |||
@@ -807,7 +807,7 @@ static struct sony_nc_event *sony_nc_events; | |||
807 | /* Vaio C* --maybe also FE*, N* and AR* ?-- special init sequence | 807 | /* Vaio C* --maybe also FE*, N* and AR* ?-- special init sequence |
808 | * for Fn keys | 808 | * for Fn keys |
809 | */ | 809 | */ |
810 | static int sony_nc_C_enable(struct dmi_system_id *id) | 810 | static int sony_nc_C_enable(const struct dmi_system_id *id) |
811 | { | 811 | { |
812 | int result = 0; | 812 | int result = 0; |
813 | 813 | ||
@@ -845,7 +845,7 @@ static struct sony_nc_event sony_C_events[] = { | |||
845 | }; | 845 | }; |
846 | 846 | ||
847 | /* SNC-only model map */ | 847 | /* SNC-only model map */ |
848 | static struct dmi_system_id sony_nc_ids[] = { | 848 | static const struct dmi_system_id sony_nc_ids[] = { |
849 | { | 849 | { |
850 | .ident = "Sony Vaio FE Series", | 850 | .ident = "Sony Vaio FE Series", |
851 | .callback = sony_nc_C_enable, | 851 | .callback = sony_nc_C_enable, |
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c index 0222bbaf7b76..6c0b2f0a51ab 100644 --- a/drivers/misc/thinkpad_acpi.c +++ b/drivers/misc/thinkpad_acpi.c | |||
@@ -4448,7 +4448,7 @@ static void ibm_exit(struct ibm_struct *ibm) | |||
4448 | 4448 | ||
4449 | static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp) | 4449 | static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp) |
4450 | { | 4450 | { |
4451 | struct dmi_device *dev = NULL; | 4451 | const struct dmi_device *dev = NULL; |
4452 | char ec_fw_string[18]; | 4452 | char ec_fw_string[18]; |
4453 | 4453 | ||
4454 | if (!tp) | 4454 | if (!tp) |