This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / i2c / chips / via686a.c

diff --git a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c
index d4938fa..851c5b2 100644 (file)
--- a/drivers/i2c/chips/via686a.c
+++ b/drivers/i2c/chips/via686a.c
@@ -52,7 +52,9 @@ MODULE_PARM_DESC(force_addr,
    Note that we can't determine the ISA address until we have initialized
    our module */
 static unsigned short normal_i2c[] = { I2C_CLIENT_END };
+static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 static unsigned int normal_isa[] = { 0x0000, I2C_CLIENT_ISA_END };
+static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END };
 
 /* Insmod parameters */
 SENSORS_INSMOD_1(via686a);
@@ -381,27 +383,27 @@ static ssize_t set_in_max(struct device *dev, const char *buf,
 static ssize_t                                                         \
        show_in##offset (struct device *dev, char *buf)         \
 {                                                              \
-       return show_in(dev, buf, offset);                       \
+       return show_in(dev, buf, 0x##offset);                   \
 }                                                              \
 static ssize_t                                                         \
        show_in##offset##_min (struct device *dev, char *buf)   \
 {                                                              \
-       return show_in_min(dev, buf, offset);           \
+       return show_in_min(dev, buf, 0x##offset);               \
 }                                                              \
 static ssize_t                                                         \
        show_in##offset##_max (struct device *dev, char *buf)   \
 {                                                              \
-       return show_in_max(dev, buf, offset);           \
+       return show_in_max(dev, buf, 0x##offset);               \
 }                                                              \
 static ssize_t set_in##offset##_min (struct device *dev,       \
                const char *buf, size_t count)                  \
 {                                                              \
-       return set_in_min(dev, buf, count, offset);             \
+       return set_in_min(dev, buf, count, 0x##offset);         \
 }                                                              \
 static ssize_t set_in##offset##_max (struct device *dev,       \
                        const char *buf, size_t count)          \
 {                                                              \
-       return set_in_max(dev, buf, count, offset);             \
+       return set_in_max(dev, buf, count, 0x##offset);         \
 }                                                              \
 static DEVICE_ATTR(in##offset##_input, S_IRUGO, show_in##offset, NULL);\
 static DEVICE_ATTR(in##offset##_min, S_IRUGO | S_IWUSR,        \
@@ -449,27 +451,27 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf,
 #define show_temp_offset(offset)                                       \
 static ssize_t show_temp_##offset (struct device *dev, char *buf)      \
 {                                                                      \
-       return show_temp(dev, buf, offset - 1);                         \
+       return show_temp(dev, buf, 0x##offset - 1);                     \
 }                                                                      \
 static ssize_t                                                         \
 show_temp_##offset##_over (struct device *dev, char *buf)              \
 {                                                                      \
-       return show_temp_over(dev, buf, offset - 1);                    \
+       return show_temp_over(dev, buf, 0x##offset - 1);                        \
 }                                                                      \
 static ssize_t                                                         \
 show_temp_##offset##_hyst (struct device *dev, char *buf)              \
 {                                                                      \
-       return show_temp_hyst(dev, buf, offset - 1);                    \
+       return show_temp_hyst(dev, buf, 0x##offset - 1);                        \
 }                                                                      \
 static ssize_t set_temp_##offset##_over (struct device *dev,           \
                const char *buf, size_t count)                          \
 {                                                                      \
-       return set_temp_over(dev, buf, count, offset - 1);              \
+       return set_temp_over(dev, buf, count, 0x##offset - 1);          \
 }                                                                      \
 static ssize_t set_temp_##offset##_hyst (struct device *dev,           \
                const char *buf, size_t count)                          \
 {                                                                      \
-       return set_temp_hyst(dev, buf, count, offset - 1);              \
+       return set_temp_hyst(dev, buf, count, 0x##offset - 1);          \
 }                                                                      \
 static DEVICE_ATTR(temp##offset##_input, S_IRUGO, show_temp_##offset, NULL);\
 static DEVICE_ATTR(temp##offset##_max, S_IRUGO | S_IWUSR,              \
@@ -520,25 +522,25 @@ static ssize_t set_fan_div(struct device *dev, const char *buf,
 #define show_fan_offset(offset)                                                \
 static ssize_t show_fan_##offset (struct device *dev, char *buf)       \
 {                                                                      \
-       return show_fan(dev, buf, offset - 1);                          \
+       return show_fan(dev, buf, 0x##offset - 1);                      \
 }                                                                      \
 static ssize_t show_fan_##offset##_min (struct device *dev, char *buf) \
 {                                                                      \
-       return show_fan_min(dev, buf, offset - 1);                      \
+       return show_fan_min(dev, buf, 0x##offset - 1);                  \
 }                                                                      \
 static ssize_t show_fan_##offset##_div (struct device *dev, char *buf) \
 {                                                                      \
-       return show_fan_div(dev, buf, offset - 1);                      \
+       return show_fan_div(dev, buf, 0x##offset - 1);                  \
 }                                                                      \
 static ssize_t set_fan_##offset##_min (struct device *dev,             \
        const char *buf, size_t count)                                  \
 {                                                                      \
-       return set_fan_min(dev, buf, count, offset - 1);                \
+       return set_fan_min(dev, buf, count, 0x##offset - 1);            \
 }                                                                      \
 static ssize_t set_fan_##offset##_div (struct device *dev,             \
                const char *buf, size_t count)                          \
 {                                                                      \
-       return set_fan_div(dev, buf, count, offset - 1);                \
+       return set_fan_div(dev, buf, count, 0x##offset - 1);            \
 }                                                                      \
 static DEVICE_ATTR(fan##offset##_input, S_IRUGO, show_fan_##offset, NULL);\
 static DEVICE_ATTR(fan##offset##_min, S_IRUGO | S_IWUSR,               \
@@ -836,7 +838,7 @@ static struct pci_driver via686a_pci_driver = {
 
 static int __init sm_via686a_init(void)
 {
-       return pci_register_driver(&via686a_pci_driver);
+       return pci_module_init(&via686a_pci_driver);
 }
 
 static void __exit sm_via686a_exit(void)