[PATCH] I2C: Kill another macro abuse in via686a

This patch kills another macro abuse in the via686a hardware monitoring
driver. Using a macro just to alias an array is quite useless, isn't it?

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 10 insertions, 13 deletions

diff --git a/drivers/i2c/chips/via686a.c b/drivers/i2c/chips/via686a.c
index 9370aaf29c3b..137d9b7cacd4 100644
--- a/drivers/i2c/chips/via686a.c
+++ b/drivers/i2c/chips/via686a.c
@@ -78,15 +78,10 @@ SENSORS_INSMOD_1(via686a);
 #define VIA686A_REG_FAN_MIN(nr) (0x3a + (nr))
 #define VIA686A_REG_FAN(nr)     (0x28 + (nr))
 
-/* the following values are as speced by VIA: */
-static const u8 regtemp[] = { 0x20, 0x21, 0x1f };
-static const u8 regover[] = { 0x39, 0x3d, 0x1d };
-static const u8 reghyst[] = { 0x3a, 0x3e, 0x1e };
-
 /* temps numbered 1-3 */
-#define VIA686A_REG_TEMP(nr)            (regtemp[nr])
-#define VIA686A_REG_TEMP_OVER(nr)       (regover[nr])
-#define VIA686A_REG_TEMP_HYST(nr)       (reghyst[nr])
+static const u8 VIA686A_REG_TEMP[]      = { 0x20, 0x21, 0x1f };
+static const u8 VIA686A_REG_TEMP_OVER[] = { 0x39, 0x3d, 0x1d };
+static const u8 VIA686A_REG_TEMP_HYST[] = { 0x3a, 0x3e, 0x1e };
 /* bits 7-6 */
 #define VIA686A_REG_TEMP_LOW1   0x4b
 /* 2 = bits 5-4, 3 = bits 7-6 */
@@ -441,7 +436,8 @@ static ssize_t set_temp_over(struct device *dev, const char *buf,
 
         down(&data->update_lock);
         data->temp_over[nr] = TEMP_TO_REG(val);
-        via686a_write_value(client, VIA686A_REG_TEMP_OVER(nr), data->temp_over[nr]);
+        via686a_write_value(client, VIA686A_REG_TEMP_OVER[nr],
+                            data->temp_over[nr]);
         up(&data->update_lock);
         return count;
 }
@@ -453,7 +449,8 @@ static ssize_t set_temp_hyst(struct device *dev, const char *buf,
 
         down(&data->update_lock);
         data->temp_hyst[nr] = TEMP_TO_REG(val);
-        via686a_write_value(client, VIA686A_REG_TEMP_HYST(nr), data->temp_hyst[nr]);
+        via686a_write_value(client, VIA686A_REG_TEMP_HYST[nr],
+                            data->temp_hyst[nr]);
         up(&data->update_lock);
         return count;
 }
@@ -763,13 +760,13 @@ static struct via686a_data *via686a_update_device(struct device *dev)
                 }
                 for (i = 0; i <= 2; i++) {
                         data->temp[i] = via686a_read_value(client,
-                                                 VIA686A_REG_TEMP(i)) << 2;
+                                                 VIA686A_REG_TEMP[i]) << 2;
                         data->temp_over[i] =
                             via686a_read_value(client,
-                                               VIA686A_REG_TEMP_OVER(i));
+                                               VIA686A_REG_TEMP_OVER[i]);
                         data->temp_hyst[i] =
                             via686a_read_value(client,
-                                               VIA686A_REG_TEMP_HYST(i));
+                                               VIA686A_REG_TEMP_HYST[i]);
                 }
                 /* add in lower 2 bits
                    temp1 uses bits 7-6 of VIA686A_REG_TEMP_LOW1