[i2c] [PATCH] i2c: normal_i2c can be made const (remaining drivers)

Jean Delvare khali at linux-fr.org
Tue Nov 20 20:36:59 CET 2007


Signed-off-by: Jean Delvare <khali at linux-fr.org>
---
 Documentation/i2c/writing-clients     |    6 +++---
 arch/arm/mach-pxa/akita-ioexp.c       |    2 +-
 drivers/i2c/chips/eeprom.c            |    2 +-
 drivers/i2c/chips/isp1301_omap.c      |    2 +-
 drivers/i2c/chips/max6875.c           |    2 +-
 drivers/i2c/chips/pca9539.c           |    4 +++-
 drivers/i2c/chips/pcf8574.c           |    8 +++++---
 drivers/i2c/chips/pcf8575.c           |    2 +-
 drivers/i2c/chips/pcf8591.c           |    2 +-
 drivers/macintosh/therm_windtunnel.c  |    2 +-
 drivers/usb/host/ohci-pnx4008.c       |    4 ++--
 drivers/video/matrox/matroxfb_maven.c |    2 +-
 drivers/w1/masters/ds2482.c           |    2 +-
 sound/soc/codecs/cs4270.c             |    2 +-
 sound/soc/s3c24xx/neo1973_wm8753.c    |    2 +-
 15 files changed, 24 insertions(+), 20 deletions(-)

--- linux-2.6.24-rc3.orig/Documentation/i2c/writing-clients	2007-10-10 09:58:06.000000000 +0200
+++ linux-2.6.24-rc3/Documentation/i2c/writing-clients	2007-11-20 20:18:51.000000000 +0100
@@ -267,9 +267,9 @@ insmod parameter of the form force_<kind
 Fortunately, as a module writer, you just have to define the `normal_i2c' 
 parameter. The complete declaration could look like this:
 
-  /* Scan 0x37, and 0x48 to 0x4f */
-  static unsigned short normal_i2c[] = { 0x37, 0x48, 0x49, 0x4a, 0x4b, 0x4c,
-                                         0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
+  /* Scan 0x4c to 0x4f */
+  static const unsigned short normal_i2c[] = { 0x4c, 0x4d, 0x4e, 0x4f,
+                                               I2C_CLIENT_END };
 
   /* Magic definition of all other variables and things */
   I2C_CLIENT_INSMOD;
--- linux-2.6.24-rc3.orig/arch/arm/mach-pxa/akita-ioexp.c	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.24-rc3/arch/arm/mach-pxa/akita-ioexp.c	2007-11-20 20:19:34.000000000 +0100
@@ -29,7 +29,7 @@
 #define MAX7310_TIMEOUT  0x04
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x18, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x18, I2C_CLIENT_END };
 
 /* I2C Magic */
 I2C_CLIENT_INSMOD;
--- linux-2.6.24-rc3.orig/drivers/i2c/chips/isp1301_omap.c	2007-10-10 09:58:25.000000000 +0200
+++ linux-2.6.24-rc3/drivers/i2c/chips/isp1301_omap.c	2007-11-20 20:14:45.000000000 +0100
@@ -140,7 +140,7 @@ static inline void notresponding(struct 
 
 /* only two addresses possible */
 #define	ISP_BASE		0x2c
-static unsigned short normal_i2c[] = {
+static const unsigned short normal_i2c[] = {
 	ISP_BASE, ISP_BASE + 1,
 	I2C_CLIENT_END };
 
--- linux-2.6.24-rc3.orig/drivers/i2c/chips/max6875.c	2007-10-10 09:58:25.000000000 +0200
+++ linux-2.6.24-rc3/drivers/i2c/chips/max6875.c	2007-11-20 20:15:24.000000000 +0100
@@ -34,7 +34,7 @@
 #include <linux/mutex.h>
 
 /* Do not scan - the MAX6875 access method will write to some EEPROM chips */
-static unsigned short normal_i2c[] = {I2C_CLIENT_END};
+static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(max6875);
--- linux-2.6.24-rc3.orig/drivers/i2c/chips/pca9539.c	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.24-rc3/drivers/i2c/chips/pca9539.c	2007-11-20 20:16:01.000000000 +0100
@@ -15,7 +15,9 @@
 #include <linux/hwmon-sysfs.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = {0x74, 0x75, 0x76, 0x77, I2C_CLIENT_END};
+static const unsigned short normal_i2c[] = {
+	0x74, 0x75, 0x76, 0x77, I2C_CLIENT_END
+};
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_1(pca9539);
--- linux-2.6.24-rc3.orig/drivers/i2c/chips/pcf8574.c	2007-10-24 09:59:28.000000000 +0200
+++ linux-2.6.24-rc3/drivers/i2c/chips/pcf8574.c	2007-11-20 20:15:12.000000000 +0100
@@ -41,9 +41,11 @@
 #include <linux/i2c.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-					0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-					I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = {
+	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+	0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+	I2C_CLIENT_END
+};
 
 /* Insmod parameters */
 I2C_CLIENT_INSMOD_2(pcf8574, pcf8574a);
--- linux-2.6.24-rc3.orig/drivers/i2c/chips/pcf8575.c	2007-11-18 23:27:00.000000000 +0100
+++ linux-2.6.24-rc3/drivers/i2c/chips/pcf8575.c	2007-11-20 20:14:52.000000000 +0100
@@ -33,7 +33,7 @@
 #include <linux/sysfs.h> /* sysfs_create_group() */
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = {
+static const unsigned short normal_i2c[] = {
 	0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
 	I2C_CLIENT_END
 };
--- linux-2.6.24-rc3.orig/drivers/i2c/chips/pcf8591.c	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.24-rc3/drivers/i2c/chips/pcf8591.c	2007-11-20 20:15:30.000000000 +0100
@@ -27,7 +27,7 @@
 #include <linux/mutex.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
+static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
 					0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
 
 /* Insmod parameters */
--- linux-2.6.24-rc3.orig/drivers/macintosh/therm_windtunnel.c	2007-10-10 09:58:25.000000000 +0200
+++ linux-2.6.24-rc3/drivers/macintosh/therm_windtunnel.c	2007-11-20 20:17:05.000000000 +0100
@@ -52,7 +52,7 @@
 static int 			do_probe( struct i2c_adapter *adapter, int addr, int kind);
 
 /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */
-static unsigned short		normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
+static const unsigned short	normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
 						 0x4c, 0x4d, 0x4e, 0x4f,
 						 0x2c, 0x2d, 0x2e, 0x2f,
 						 I2C_CLIENT_END };
--- linux-2.6.24-rc3.orig/drivers/usb/host/ohci-pnx4008.c	2007-10-10 09:58:31.000000000 +0200
+++ linux-2.6.24-rc3/drivers/usb/host/ohci-pnx4008.c	2007-11-20 20:16:24.000000000 +0100
@@ -112,9 +112,9 @@ static int isp1301_detach(struct i2c_cli
 static int isp1301_command(struct i2c_client *client, unsigned int cmd,
 			   void *arg);
 
-static unsigned short normal_i2c[] =
+static const unsigned short normal_i2c[] =
     { ISP1301_I2C_ADDR, ISP1301_I2C_ADDR + 1, I2C_CLIENT_END };
-static unsigned short dummy_i2c_addrlist[] = { I2C_CLIENT_END };
+static const unsigned short dummy_i2c_addrlist[] = { I2C_CLIENT_END };
 
 static struct i2c_client_address_data addr_data = {
 	.normal_i2c = normal_i2c,
--- linux-2.6.24-rc3.orig/drivers/video/matrox/matroxfb_maven.c	2007-10-24 09:59:48.000000000 +0200
+++ linux-2.6.24-rc3/drivers/video/matrox/matroxfb_maven.c	2007-11-20 20:17:31.000000000 +0100
@@ -1232,7 +1232,7 @@ static int maven_shutdown_client(struct 
 	return 0;
 }
 
-static unsigned short normal_i2c[] = { MAVEN_I2CID, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { MAVEN_I2CID, I2C_CLIENT_END };
 I2C_CLIENT_INSMOD;
 
 static struct i2c_driver maven_driver;
--- linux-2.6.24-rc3.orig/drivers/w1/masters/ds2482.c	2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.24-rc3/drivers/w1/masters/ds2482.c	2007-11-20 20:17:24.000000000 +0100
@@ -29,7 +29,7 @@
  * However, the chip cannot be detected without doing an i2c write,
  * so use the force module parameter.
  */
-static unsigned short normal_i2c[] = {I2C_CLIENT_END};
+static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
 
 /**
  * Insmod parameters
--- linux-2.6.24-rc3.orig/sound/soc/codecs/cs4270.c	2007-10-24 10:00:00.000000000 +0200
+++ linux-2.6.24-rc3/sound/soc/codecs/cs4270.c	2007-11-20 20:19:06.000000000 +0100
@@ -234,7 +234,7 @@ static int cs4270_set_dai_fmt(struct snd
  * lower three bits are determined via the AD2, AD1, and AD0 pins
  * (respectively).
  */
-static unsigned short normal_i2c[] = {
+static const unsigned short normal_i2c[] = {
 	0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, I2C_CLIENT_END
 };
 I2C_CLIENT_INSMOD;
--- linux-2.6.24-rc3.orig/sound/soc/s3c24xx/neo1973_wm8753.c	2007-10-10 09:59:05.000000000 +0200
+++ linux-2.6.24-rc3/sound/soc/s3c24xx/neo1973_wm8753.c	2007-11-20 20:19:13.000000000 +0100
@@ -573,7 +573,7 @@ static struct snd_soc_device neo1973_snd
 
 static struct i2c_client client_template;
 
-static unsigned short normal_i2c[] = { 0x7C, I2C_CLIENT_END };
+static const unsigned short normal_i2c[] = { 0x7C, I2C_CLIENT_END };
 
 /* Magic definition of all other variables and things */
 I2C_CLIENT_INSMOD;
--- linux-2.6.24-rc3.orig/drivers/i2c/chips/eeprom.c	2007-11-17 10:26:25.000000000 +0100
+++ linux-2.6.24-rc3/drivers/i2c/chips/eeprom.c	2007-11-20 20:19:49.000000000 +0100
@@ -35,7 +35,7 @@
 #include <linux/mutex.h>
 
 /* Addresses to scan */
-static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
+static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54,
 					0x55, 0x56, 0x57, I2C_CLIENT_END };
 
 /* Insmod parameters */


-- 
Jean Delvare



More information about the i2c mailing list