From 6582c3c9bb6bf1f54ff4a2ad2277bbb952c8af0a Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Tue, 27 Sep 2011 15:17:21 +0000
Subject: [PATCH] Modules: Don't name function parameters "register", it's a
 reserved compiler keyword.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-2.10@5995 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 CHANGES                 | 1 +
 kernel/chips/adm1024.c  | 4 ++--
 kernel/chips/adm1026.c  | 4 ++--
 kernel/chips/fscher.c   | 4 ++--
 kernel/chips/fscpos.c   | 4 ++--
 kernel/chips/fscscy.c   | 4 ++--
 kernel/chips/it87.c     | 4 ++--
 kernel/chips/lm78.c     | 4 ++--
 kernel/chips/lm85.c     | 4 ++--
 kernel/chips/lm87.c     | 4 ++--
 kernel/chips/maxilife.c | 4 ++--
 kernel/chips/mic74.c    | 4 ++--
 kernel/chips/mtp008.c   | 4 ++--
 kernel/chips/sis5595.c  | 4 ++--
 kernel/chips/via686a.c  | 4 ++--
 kernel/chips/vt1211.c   | 4 ++--
 kernel/chips/vt8231.c   | 4 ++--
 kernel/chips/w83627hf.c | 4 ++--
 kernel/chips/w83781d.c  | 4 ++--
 19 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/CHANGES b/CHANGES
index c46595a1..28b6290d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,7 @@ SVN-HEAD
   Module i2c-amd8111: Fix timeout handling (2.6 backport)
   Module i2c-piix4: ATI SB800 is not actually supported
   Module it87: Properly decode -128 degrees C (2.6 backport)
+  Modules: Don't name function parameters "register"
   Program eepromer: Fix array initialization overrun
   Program sensord: Fix a memory leak when a chip name is provided
   Program sensors: Fix a memory leak when a chip name is provided
diff --git a/kernel/chips/adm1024.c b/kernel/chips/adm1024.c
index 680b8337..c3edc260 100644
--- a/kernel/chips/adm1024.c
+++ b/kernel/chips/adm1024.c
@@ -182,8 +182,8 @@ static int adm1024_detect(struct i2c_adapter *adapter, int address,
 			  unsigned short flags, int kind);
 static int adm1024_detach_client(struct i2c_client *client);
 
-static int adm1024_read_value(struct i2c_client *client, u8 register);
-static int adm1024_write_value(struct i2c_client *client, u8 register,
+static int adm1024_read_value(struct i2c_client *client, u8 reg);
+static int adm1024_write_value(struct i2c_client *client, u8 reg,
 			       u8 value);
 static void adm1024_update_client(struct i2c_client *client);
 static void adm1024_init_client(struct i2c_client *client);
diff --git a/kernel/chips/adm1026.c b/kernel/chips/adm1026.c
index cce55faf..42e30156 100644
--- a/kernel/chips/adm1026.c
+++ b/kernel/chips/adm1026.c
@@ -333,8 +333,8 @@ static int adm1026_detect(struct i2c_adapter *adapter, int address,
 			unsigned short flags, int kind);
 static int adm1026_detach_client(struct i2c_client *client);
 
-static int adm1026_read_value(struct i2c_client *client, u8 register);
-static int adm1026_write_value(struct i2c_client *client, u8 register, int value);
+static int adm1026_read_value(struct i2c_client *client, u8 reg);
+static int adm1026_write_value(struct i2c_client *client, u8 reg, int value);
 static void adm1026_print_gpio(struct i2c_client *client);
 static void adm1026_fixup_gpio(struct i2c_client *client);
 static void adm1026_update_client(struct i2c_client *client);
diff --git a/kernel/chips/fscher.c b/kernel/chips/fscher.c
index 3fabba3a..73e5d32b 100644
--- a/kernel/chips/fscher.c
+++ b/kernel/chips/fscher.c
@@ -133,8 +133,8 @@ static int fscher_detect(struct i2c_adapter *adapter, int address,
                          unsigned short flags, int kind);
 static int fscher_detach_client(struct i2c_client *client);
 
-static int fscher_read_value(struct i2c_client *client, u8 register);
-static int fscher_write_value(struct i2c_client *client, u8 register,
+static int fscher_read_value(struct i2c_client *client, u8 reg);
+static int fscher_write_value(struct i2c_client *client, u8 reg,
                               u8 value);
 static void fscher_update_client(struct i2c_client *client);
 static void fscher_init_client(struct i2c_client *client);
diff --git a/kernel/chips/fscpos.c b/kernel/chips/fscpos.c
index 0bb4858e..cf23bfea 100644
--- a/kernel/chips/fscpos.c
+++ b/kernel/chips/fscpos.c
@@ -137,8 +137,8 @@ static int fscpos_detect(struct i2c_adapter *adapter, int address,
 		       unsigned short flags, int kind);
 static int fscpos_detach_client(struct i2c_client *client);
 
-static int fscpos_read_value(struct i2c_client *client, u8 register);
-static int fscpos_write_value(struct i2c_client *client, u8 register,
+static int fscpos_read_value(struct i2c_client *client, u8 reg);
+static int fscpos_write_value(struct i2c_client *client, u8 reg,
 			    u8 value);
 static void fscpos_update_client(struct i2c_client *client);
 static void fscpos_init_client(struct i2c_client *client);
diff --git a/kernel/chips/fscscy.c b/kernel/chips/fscscy.c
index 559a106b..d4ae0971 100644
--- a/kernel/chips/fscscy.c
+++ b/kernel/chips/fscscy.c
@@ -191,8 +191,8 @@ static int fscscy_detect(struct i2c_adapter *adapter, int address,
 		       unsigned short flags, int kind);
 static int fscscy_detach_client(struct i2c_client *client);
 
-static int fscscy_read_value(struct i2c_client *client, u8 register);
-static int fscscy_write_value(struct i2c_client *client, u8 register,
+static int fscscy_read_value(struct i2c_client *client, u8 reg);
+static int fscscy_write_value(struct i2c_client *client, u8 reg,
 			    u8 value);
 static void fscscy_update_client(struct i2c_client *client);
 static void fscscy_init_client(struct i2c_client *client);
diff --git a/kernel/chips/it87.c b/kernel/chips/it87.c
index 9442c702..70d273f4 100644
--- a/kernel/chips/it87.c
+++ b/kernel/chips/it87.c
@@ -253,8 +253,8 @@ static int it87_detect(struct i2c_adapter *adapter, int address,
 		       unsigned short flags, int kind);
 static int it87_detach_client(struct i2c_client *client);
 
-static int it87_read_value(struct i2c_client *client, u8 register);
-static int it87_write_value(struct i2c_client *client, u8 register,
+static int it87_read_value(struct i2c_client *client, u8 reg);
+static int it87_write_value(struct i2c_client *client, u8 reg,
 			    u8 value);
 static void it87_update_client(struct i2c_client *client);
 static void it87_init_client(struct i2c_client *client);
diff --git a/kernel/chips/lm78.c b/kernel/chips/lm78.c
index 055dde49..2fad4c5b 100644
--- a/kernel/chips/lm78.c
+++ b/kernel/chips/lm78.c
@@ -143,8 +143,8 @@ static int lm78_detect(struct i2c_adapter *adapter, int address,
 		       unsigned short flags, int kind);
 static int lm78_detach_client(struct i2c_client *client);
 
-static int lm78_read_value(struct i2c_client *client, u8 register);
-static int lm78_write_value(struct i2c_client *client, u8 register,
+static int lm78_read_value(struct i2c_client *client, u8 reg);
+static int lm78_write_value(struct i2c_client *client, u8 reg,
 			    u8 value);
 static void lm78_update_client(struct i2c_client *client);
 static void lm78_init_client(struct i2c_client *client);
diff --git a/kernel/chips/lm85.c b/kernel/chips/lm85.c
index cc388bb2..9479d7ca 100644
--- a/kernel/chips/lm85.c
+++ b/kernel/chips/lm85.c
@@ -419,8 +419,8 @@ static int lm85_attach_adapter(struct i2c_adapter *adapter);
 static int lm85_detect(struct i2c_adapter *adapter, int address,
 			unsigned short flags, int kind);
 static int lm85_detach_client(struct i2c_client *client);
-static int lm85_read_value(struct i2c_client *client, u16 register);
-static int lm85_write_value(struct i2c_client *client, u16 register, int value);
+static int lm85_read_value(struct i2c_client *client, u16 reg);
+static int lm85_write_value(struct i2c_client *client, u16 reg, int value);
 static void lm85_update_client(struct i2c_client *client);
 static void lm85_init_client(struct i2c_client *client);
 
diff --git a/kernel/chips/lm87.c b/kernel/chips/lm87.c
index ee866021..655f1571 100644
--- a/kernel/chips/lm87.c
+++ b/kernel/chips/lm87.c
@@ -221,8 +221,8 @@ static int lm87_detect(struct i2c_adapter *adapter, int address,
 			  unsigned short flags, int kind);
 static int lm87_detach_client(struct i2c_client *client);
 
-static int lm87_read_value(struct i2c_client *client, u8 register);
-static int lm87_write_value(struct i2c_client *client, u8 register,
+static int lm87_read_value(struct i2c_client *client, u8 reg);
+static int lm87_write_value(struct i2c_client *client, u8 reg,
 			       u8 value);
 static void lm87_update_client(struct i2c_client *client);
 static void lm87_init_client(struct i2c_client *client);
diff --git a/kernel/chips/maxilife.c b/kernel/chips/maxilife.c
index 7eab4be5..6e6ace17 100644
--- a/kernel/chips/maxilife.c
+++ b/kernel/chips/maxilife.c
@@ -268,10 +268,10 @@ static int maxi_detect(struct i2c_adapter *adapter, int address,
 		       unsigned short flags, int kind);
 static int maxi_detach_client(struct i2c_client *client);
 
-static int maxi_read_value(struct i2c_client *client, u8 register);
+static int maxi_read_value(struct i2c_client *client, u8 reg);
 static int maxi_read_token(struct i2c_client *client, u16 token);
 #ifndef NOWRITE
-static int maxi_write_value(struct i2c_client *client, u8 register,
+static int maxi_write_value(struct i2c_client *client, u8 reg,
 			    u8 value);
 #endif
 static int maxi_write_token_loop(struct i2c_client *client, u16 token,
diff --git a/kernel/chips/mic74.c b/kernel/chips/mic74.c
index b04a6bbe..57bf8af8 100644
--- a/kernel/chips/mic74.c
+++ b/kernel/chips/mic74.c
@@ -79,8 +79,8 @@ static int mic74_detect(struct i2c_adapter *adapter, int address,
 			  unsigned short flags, int kind);
 static int mic74_detach_client(struct i2c_client *client);
 
-static int mic74_read_value(struct i2c_client *client, u8 register);
-static int mic74_write_value(struct i2c_client *client, u8 register,
+static int mic74_read_value(struct i2c_client *client, u8 reg);
+static int mic74_write_value(struct i2c_client *client, u8 reg,
 			       u8 value);
 static void mic74_update_client(struct i2c_client *client);
 static void mic74_init_client(struct i2c_client *client);
diff --git a/kernel/chips/mtp008.c b/kernel/chips/mtp008.c
index 2d1d9de7..e9064793 100644
--- a/kernel/chips/mtp008.c
+++ b/kernel/chips/mtp008.c
@@ -225,8 +225,8 @@ static int mtp008_detect(struct i2c_adapter *adapter, int address,
 			 unsigned short flags, int kind);
 static int mtp008_detach_client(struct i2c_client *client);
 
-static int mtp008_read_value(struct i2c_client *client, u8 register);
-static int mtp008_write_value(struct i2c_client *client, u8 register, u8 value);
+static int mtp008_read_value(struct i2c_client *client, u8 reg);
+static int mtp008_write_value(struct i2c_client *client, u8 reg, u8 value);
 static void mtp008_update_client(struct i2c_client *client);
 static void mtp008_init_client(struct i2c_client *client);
 
diff --git a/kernel/chips/sis5595.c b/kernel/chips/sis5595.c
index 88960186..5f60366e 100644
--- a/kernel/chips/sis5595.c
+++ b/kernel/chips/sis5595.c
@@ -193,8 +193,8 @@ static int sis5595_detect(struct i2c_adapter *adapter, int address,
 			  unsigned short flags, int kind);
 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,
+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 void sis5595_update_client(struct i2c_client *client);
 static void sis5595_init_client(struct i2c_client *client);
diff --git a/kernel/chips/via686a.c b/kernel/chips/via686a.c
index fdf79c1b..69f6821b 100644
--- a/kernel/chips/via686a.c
+++ b/kernel/chips/via686a.c
@@ -338,8 +338,8 @@ static int via686a_detect(struct i2c_adapter *adapter, int address,
 			  unsigned short flags, int kind);
 static int via686a_detach_client(struct i2c_client *client);
 
-static int via686a_read_value(struct i2c_client *client, u8 register);
-static void via686a_write_value(struct i2c_client *client, u8 register,
+static int via686a_read_value(struct i2c_client *client, u8 reg);
+static void via686a_write_value(struct i2c_client *client, u8 reg,
 				u8 value);
 static void via686a_update_client(struct i2c_client *client);
 static void via686a_init_client(struct i2c_client *client);
diff --git a/kernel/chips/vt1211.c b/kernel/chips/vt1211.c
index 37346f1c..c24fcb2e 100644
--- a/kernel/chips/vt1211.c
+++ b/kernel/chips/vt1211.c
@@ -222,8 +222,8 @@ static int vt1211_detect(struct i2c_adapter *adapter, int address,
 			  unsigned short flags, int kind);
 static int vt1211_detach_client(struct i2c_client *client);
 
-static inline int vt_rdval(struct i2c_client *client, u8 register);
-static inline void vt1211_write_value(struct i2c_client *client, u8 register,
+static inline int vt_rdval(struct i2c_client *client, u8 reg);
+static inline void vt1211_write_value(struct i2c_client *client, u8 reg,
 			       u8 value);
 static void vt1211_update_client(struct i2c_client *client);
 static void vt1211_init_client(struct i2c_client *client);
diff --git a/kernel/chips/vt8231.c b/kernel/chips/vt8231.c
index 24ab2e49..a1825991 100644
--- a/kernel/chips/vt8231.c
+++ b/kernel/chips/vt8231.c
@@ -171,8 +171,8 @@ static int vt8231_detect(struct i2c_adapter *adapter, int address,
 			  unsigned short flags, int kind);
 static int vt8231_detach_client(struct i2c_client *client);
 
-static inline int vt_rdval(struct i2c_client *client, u8 register);
-static inline void vt8231_write_value(struct i2c_client *client, u8 register,
+static inline int vt_rdval(struct i2c_client *client, u8 reg);
+static inline void vt8231_write_value(struct i2c_client *client, u8 reg,
 			       u8 value);
 static void vt8231_update_client(struct i2c_client *client);
 static void vt8231_init_client(struct i2c_client *client);
diff --git a/kernel/chips/w83627hf.c b/kernel/chips/w83627hf.c
index 688dd376..95984cc4 100644
--- a/kernel/chips/w83627hf.c
+++ b/kernel/chips/w83627hf.c
@@ -325,8 +325,8 @@ static int w83627hf_detect(struct i2c_adapter *adapter, int address,
 			  unsigned short flags, int kind);
 static int w83627hf_detach_client(struct i2c_client *client);
 
-static int w83627hf_read_value(struct i2c_client *client, u16 register);
-static int w83627hf_write_value(struct i2c_client *client, u16 register,
+static int w83627hf_read_value(struct i2c_client *client, u16 reg);
+static int w83627hf_write_value(struct i2c_client *client, u16 reg,
 			       u16 value);
 static void w83627hf_update_client(struct i2c_client *client);
 static void w83627hf_init_client(struct i2c_client *client);
diff --git a/kernel/chips/w83781d.c b/kernel/chips/w83781d.c
index 5b7f6401..0f1c6d10 100644
--- a/kernel/chips/w83781d.c
+++ b/kernel/chips/w83781d.c
@@ -297,8 +297,8 @@ static int w83781d_detect(struct i2c_adapter *adapter, int address,
 			  unsigned short flags, int kind);
 static int w83781d_detach_client(struct i2c_client *client);
 
-static int w83781d_read_value(struct i2c_client *client, u16 register);
-static int w83781d_write_value(struct i2c_client *client, u16 register,
+static int w83781d_read_value(struct i2c_client *client, u16 reg);
+static int w83781d_write_value(struct i2c_client *client, u16 reg,
 			       u16 value);
 static void w83781d_update_client(struct i2c_client *client);
 static void w83781d_init_client(struct i2c_client *client);