diff options
author | Mark van Doesburg <mark.vandoesburg@hetnet.nl> | 2009-01-07 10:37:27 -0500 |
---|---|---|
committer | Jean Delvare <khali@linux-fr.org> | 2009-01-07 10:37:27 -0500 |
commit | 77a4a3e2a36aea5896f86653f6b77168d578c962 (patch) | |
tree | cf40d45a2b78957ab5f66e5de08bed213f9af930 /drivers/hwmon | |
parent | bc37ae71207ca899efb93be1fe6b000366debc3a (diff) |
hwmon: (f71882fg) Misc cleanups
A few cleanups that were originally part of a larger patch but are
better submitted separately.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Cc: Mark van Doesburg <mark.vandoesburg@hetnet.nl>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/f71882fg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c index e2f3c5a82153..c6fa8578bdeb 100644 --- a/drivers/hwmon/f71882fg.c +++ b/drivers/hwmon/f71882fg.c | |||
@@ -27,11 +27,11 @@ | |||
27 | #include <linux/hwmon-sysfs.h> | 27 | #include <linux/hwmon-sysfs.h> |
28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
30 | #include <asm/io.h> | 30 | #include <linux/io.h> |
31 | 31 | ||
32 | #define DRVNAME "f71882fg" | 32 | #define DRVNAME "f71882fg" |
33 | 33 | ||
34 | #define SIO_F71882FG_LD_HWM 0x04 /* Hardware monitor logical device*/ | 34 | #define SIO_F71882FG_LD_HWM 0x04 /* Hardware monitor logical device */ |
35 | #define SIO_UNLOCK_KEY 0x87 /* Key to enable Super-I/O */ | 35 | #define SIO_UNLOCK_KEY 0x87 /* Key to enable Super-I/O */ |
36 | #define SIO_LOCK_KEY 0xAA /* Key to diasble Super-I/O */ | 36 | #define SIO_LOCK_KEY 0xAA /* Key to diasble Super-I/O */ |
37 | 37 | ||
@@ -78,7 +78,7 @@ static unsigned short force_id; | |||
78 | module_param(force_id, ushort, 0); | 78 | module_param(force_id, ushort, 0); |
79 | MODULE_PARM_DESC(force_id, "Override the detected device ID"); | 79 | MODULE_PARM_DESC(force_id, "Override the detected device ID"); |
80 | 80 | ||
81 | static struct platform_device *f71882fg_pdev = NULL; | 81 | static struct platform_device *f71882fg_pdev; |
82 | 82 | ||
83 | /* Super-I/O Function prototypes */ | 83 | /* Super-I/O Function prototypes */ |
84 | static inline int superio_inb(int base, int reg); | 84 | static inline int superio_inb(int base, int reg); |
@@ -114,7 +114,7 @@ struct f71882fg_data { | |||
114 | u8 temp_diode_open; | 114 | u8 temp_diode_open; |
115 | }; | 115 | }; |
116 | 116 | ||
117 | /* Sysfs in*/ | 117 | /* Sysfs in */ |
118 | static ssize_t show_in(struct device *dev, struct device_attribute *devattr, | 118 | static ssize_t show_in(struct device *dev, struct device_attribute *devattr, |
119 | char *buf); | 119 | char *buf); |
120 | static ssize_t show_in_max(struct device *dev, struct device_attribute | 120 | static ssize_t show_in_max(struct device *dev, struct device_attribute |
@@ -335,7 +335,7 @@ static void f71882fg_write8(struct f71882fg_data *data, u8 reg, u8 val) | |||
335 | outb(val, data->addr + DATA_REG_OFFSET); | 335 | outb(val, data->addr + DATA_REG_OFFSET); |
336 | } | 336 | } |
337 | 337 | ||
338 | static struct f71882fg_data *f71882fg_update_device(struct device * dev) | 338 | static struct f71882fg_data *f71882fg_update_device(struct device *dev) |
339 | { | 339 | { |
340 | struct f71882fg_data *data = dev_get_drvdata(dev); | 340 | struct f71882fg_data *data = dev_get_drvdata(dev); |
341 | int nr, reg, reg2; | 341 | int nr, reg, reg2; |