aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-10-03 15:15:40 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-09 20:22:20 -0400
commit1855256c497ecfefc730df6032243f26855ce52c (patch)
treeb73947f1a5e1b798e1dec068ac1cda25ae910bf6 /drivers/hwmon
parentbbf25010f1a6b761914430f5fca081ec8c7accd1 (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/hwmon')
-rw-r--r--drivers/hwmon/abituguru.c2
-rw-r--r--drivers/hwmon/applesmc.c2
-rw-r--r--drivers/hwmon/hdaps.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwmon/abituguru.c b/drivers/hwmon/abituguru.c
index d575ee958de5..2317f4bb9c92 100644
--- a/drivers/hwmon/abituguru.c
+++ b/drivers/hwmon/abituguru.c
@@ -1449,7 +1449,7 @@ static int __init abituguru_init(void)
1449 struct resource res = { .flags = IORESOURCE_IO }; 1449 struct resource res = { .flags = IORESOURCE_IO };
1450 1450
1451#ifdef CONFIG_DMI 1451#ifdef CONFIG_DMI
1452 char *board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR); 1452 const char *board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
1453 1453
1454 /* safety check, refuse to load on non Abit motherboards */ 1454 /* safety check, refuse to load on non Abit motherboards */
1455 if (!force && (!board_vendor || 1455 if (!force && (!board_vendor ||
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 941729a131f5..56213b7f8188 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -1071,7 +1071,7 @@ static const struct attribute_group temperature_attributes_group =
1071/* 1071/*
1072 * applesmc_dmi_match - found a match. return one, short-circuiting the hunt. 1072 * applesmc_dmi_match - found a match. return one, short-circuiting the hunt.
1073 */ 1073 */
1074static int applesmc_dmi_match(struct dmi_system_id *id) 1074static int applesmc_dmi_match(const struct dmi_system_id *id)
1075{ 1075{
1076 int i = 0; 1076 int i = 0;
1077 struct dmi_match_data* dmi_data = id->driver_data; 1077 struct dmi_match_data* dmi_data = id->driver_data;
diff --git a/drivers/hwmon/hdaps.c b/drivers/hwmon/hdaps.c
index e0cf5e6fe5bc..a7c6d407572b 100644
--- a/drivers/hwmon/hdaps.c
+++ b/drivers/hwmon/hdaps.c
@@ -480,14 +480,14 @@ static struct attribute_group hdaps_attribute_group = {
480/* Module stuff */ 480/* Module stuff */
481 481
482/* hdaps_dmi_match - found a match. return one, short-circuiting the hunt. */ 482/* hdaps_dmi_match - found a match. return one, short-circuiting the hunt. */
483static int __init hdaps_dmi_match(struct dmi_system_id *id) 483static int __init hdaps_dmi_match(const struct dmi_system_id *id)
484{ 484{
485 printk(KERN_INFO "hdaps: %s detected.\n", id->ident); 485 printk(KERN_INFO "hdaps: %s detected.\n", id->ident);
486 return 1; 486 return 1;
487} 487}
488 488
489/* hdaps_dmi_match_invert - found an inverted match. */ 489/* hdaps_dmi_match_invert - found an inverted match. */
490static int __init hdaps_dmi_match_invert(struct dmi_system_id *id) 490static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
491{ 491{
492 hdaps_invert = 1; 492 hdaps_invert = 1;
493 printk(KERN_INFO "hdaps: inverting axis readings.\n"); 493 printk(KERN_INFO "hdaps: inverting axis readings.\n");