summaryrefslogtreecommitdiff
path: root/drivers/hwmon/sis5595.c
diff options
context:
space:
mode:
authorDarren Jenkins <darrenrjenkins@gmail.com>2006-02-27 23:14:58 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-23 14:21:55 -0800
commitf6c27fc17c5e575c5471fb344bdbd5f5f6072136 (patch)
tree0b6b2e884ef47278471e450f5a346ada5c451f00 /drivers/hwmon/sis5595.c
parent279a022d4a12598b58aee47a73faf2d8cc72c91f (diff)
downloadlinux-3.10-f6c27fc17c5e575c5471fb344bdbd5f5f6072136.tar.gz
linux-3.10-f6c27fc17c5e575c5471fb344bdbd5f5f6072136.tar.bz2
linux-3.10-f6c27fc17c5e575c5471fb344bdbd5f5f6072136.zip
[PATCH] I2C: hwmon: Rename register parameters
"register" is a reserved keyword so using it as a parameter name can confuse some compilers, most notably ICC. The patch below just renames all occurences to reg which fits the actual function declarations. Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hwmon/sis5595.c')
-rw-r--r--drivers/hwmon/sis5595.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 4db0dd871ee..6f3fda73f70 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -193,8 +193,8 @@ static struct pci_dev *s_bridge; /* pointer to the (only) sis5595 */
static int sis5595_detect(struct i2c_adapter *adapter);
static int sis5595_detach_client(struct i2c_client *client);
-static int sis5595_read_value(struct i2c_client *client, u8 register);
-static int sis5595_write_value(struct i2c_client *client, u8 register, u8 value);
+static int sis5595_read_value(struct i2c_client *client, u8 reg);
+static int sis5595_write_value(struct i2c_client *client, u8 reg, u8 value);
static struct sis5595_data *sis5595_update_device(struct device *dev);
static void sis5595_init_client(struct i2c_client *client);