diff options
author | Jim Cromie <jim.cromie@gmail.com> | 2008-10-18 23:27:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 11:52:35 -0400 |
commit | 2a32ec2500514109754e07721d9d5d431a706a31 (patch) | |
tree | edc33228e90b6fd064f4ccd56edac489f05c0a4a | |
parent | b267e8cdc638dfa53360d532aa56afa0ec12e6a5 (diff) |
hwmon/pc87360 separate alarm files: define LDNI_MAX const
Driver handles 3 logical devices in fixed length array. Give this a
define-d constant.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/hwmon/pc87360.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c index c80ee5f056ba..7153b630ad4c 100644 --- a/drivers/hwmon/pc87360.c +++ b/drivers/hwmon/pc87360.c | |||
@@ -75,7 +75,8 @@ MODULE_PARM_DESC(force_id, "Override the detected device ID"); | |||
75 | #define FSCM 0x09 /* Logical device: fans */ | 75 | #define FSCM 0x09 /* Logical device: fans */ |
76 | #define VLM 0x0d /* Logical device: voltages */ | 76 | #define VLM 0x0d /* Logical device: voltages */ |
77 | #define TMS 0x0e /* Logical device: temperatures */ | 77 | #define TMS 0x0e /* Logical device: temperatures */ |
78 | static const u8 logdev[3] = { FSCM, VLM, TMS }; | 78 | #define LDNI_MAX 3 |
79 | static const u8 logdev[LDNI_MAX] = { FSCM, VLM, TMS }; | ||
79 | 80 | ||
80 | #define LD_FAN 0 | 81 | #define LD_FAN 0 |
81 | #define LD_IN 1 | 82 | #define LD_IN 1 |
@@ -1074,7 +1075,7 @@ static int __devinit pc87360_probe(struct platform_device *pdev) | |||
1074 | mutex_init(&data->update_lock); | 1075 | mutex_init(&data->update_lock); |
1075 | platform_set_drvdata(pdev, data); | 1076 | platform_set_drvdata(pdev, data); |
1076 | 1077 | ||
1077 | for (i = 0; i < 3; i++) { | 1078 | for (i = 0; i < LDNI_MAX; i++) { |
1078 | if (((data->address[i] = extra_isa[i])) | 1079 | if (((data->address[i] = extra_isa[i])) |
1079 | && !request_region(extra_isa[i], PC87360_EXTENT, | 1080 | && !request_region(extra_isa[i], PC87360_EXTENT, |
1080 | pc87360_driver.driver.name)) { | 1081 | pc87360_driver.driver.name)) { |