i2c: normal_i2c can be made const (remaining drivers)

+3 -3

Documentation/i2c/writing-clients

··· 267 267 Fortunately, as a module writer, you just have to define the `normal_i2c' 268 268 parameter. The complete declaration could look like this: 269 269 270 - /* Scan 0x37, and 0x48 to 0x4f */ 271 - static unsigned short normal_i2c[] = { 0x37, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 272 - 0x4d, 0x4e, 0x4f, I2C_CLIENT_END }; 270 + /* Scan 0x4c to 0x4f */ 271 + static const unsigned short normal_i2c[] = { 0x4c, 0x4d, 0x4e, 0x4f, 272 + I2C_CLIENT_END }; 273 273 274 274 /* Magic definition of all other variables and things */ 275 275 I2C_CLIENT_INSMOD;

+1 -1

arch/arm/mach-pxa/akita-ioexp.c

··· 29 29 #define MAX7310_TIMEOUT 0x04 30 30 31 31 /* Addresses to scan */ 32 - static unsigned short normal_i2c[] = { 0x18, I2C_CLIENT_END }; 32 + static const unsigned short normal_i2c[] = { 0x18, I2C_CLIENT_END }; 33 33 34 34 /* I2C Magic */ 35 35 I2C_CLIENT_INSMOD;

+1 -1

drivers/i2c/chips/eeprom.c

··· 35 35 #include <linux/mutex.h> 36 36 37 37 /* Addresses to scan */ 38 - static unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54, 38 + static const unsigned short normal_i2c[] = { 0x50, 0x51, 0x52, 0x53, 0x54, 39 39 0x55, 0x56, 0x57, I2C_CLIENT_END }; 40 40 41 41 /* Insmod parameters */

+1 -1

drivers/i2c/chips/max6875.c

··· 34 34 #include <linux/mutex.h> 35 35 36 36 /* Do not scan - the MAX6875 access method will write to some EEPROM chips */ 37 - static unsigned short normal_i2c[] = {I2C_CLIENT_END}; 37 + static const unsigned short normal_i2c[] = { I2C_CLIENT_END }; 38 38 39 39 /* Insmod parameters */ 40 40 I2C_CLIENT_INSMOD_1(max6875);

+5 -3

drivers/i2c/chips/pcf8574.c

··· 41 41 #include <linux/i2c.h> 42 42 43 43 /* Addresses to scan */ 44 - static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 45 - 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 46 - I2C_CLIENT_END }; 44 + static const unsigned short normal_i2c[] = { 45 + 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 46 + 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 47 + I2C_CLIENT_END 48 + }; 47 49 48 50 /* Insmod parameters */ 49 51 I2C_CLIENT_INSMOD_2(pcf8574, pcf8574a);

+1 -1

drivers/i2c/chips/pcf8575.c

··· 33 33 #include <linux/sysfs.h> /* sysfs_create_group() */ 34 34 35 35 /* Addresses to scan */ 36 - static unsigned short normal_i2c[] = { 36 + static const unsigned short normal_i2c[] = { 37 37 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 38 38 I2C_CLIENT_END 39 39 };

+1 -1

drivers/i2c/chips/pcf8591.c

··· 27 27 #include <linux/mutex.h> 28 28 29 29 /* Addresses to scan */ 30 - static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c, 30 + static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c, 31 31 0x4d, 0x4e, 0x4f, I2C_CLIENT_END }; 32 32 33 33 /* Insmod parameters */

+1 -1

drivers/macintosh/therm_windtunnel.c

··· 52 52 static int do_probe( struct i2c_adapter *adapter, int addr, int kind); 53 53 54 54 /* scan 0x48-0x4f (DS1775) and 0x2c-2x2f (ADM1030) */ 55 - static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 55 + static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 56 56 0x4c, 0x4d, 0x4e, 0x4f, 57 57 0x2c, 0x2d, 0x2e, 0x2f, 58 58 I2C_CLIENT_END };

+2 -2

drivers/usb/host/ohci-pnx4008.c

··· 112 112 static int isp1301_command(struct i2c_client *client, unsigned int cmd, 113 113 void *arg); 114 114 115 - static unsigned short normal_i2c[] = 115 + static const unsigned short normal_i2c[] = 116 116 { ISP1301_I2C_ADDR, ISP1301_I2C_ADDR + 1, I2C_CLIENT_END }; 117 - static unsigned short dummy_i2c_addrlist[] = { I2C_CLIENT_END }; 117 + static const unsigned short dummy_i2c_addrlist[] = { I2C_CLIENT_END }; 118 118 119 119 static struct i2c_client_address_data addr_data = { 120 120 .normal_i2c = normal_i2c,

+1 -1

drivers/video/matrox/matroxfb_maven.c

··· 1232 1232 return 0; 1233 1233 } 1234 1234 1235 - static unsigned short normal_i2c[] = { MAVEN_I2CID, I2C_CLIENT_END }; 1235 + static const unsigned short normal_i2c[] = { MAVEN_I2CID, I2C_CLIENT_END }; 1236 1236 I2C_CLIENT_INSMOD; 1237 1237 1238 1238 static struct i2c_driver maven_driver;

+1 -1

drivers/w1/masters/ds2482.c

··· 29 29 * However, the chip cannot be detected without doing an i2c write, 30 30 * so use the force module parameter. 31 31 */ 32 - static unsigned short normal_i2c[] = {I2C_CLIENT_END}; 32 + static const unsigned short normal_i2c[] = { I2C_CLIENT_END }; 33 33 34 34 /** 35 35 * Insmod parameters

+1 -1

sound/soc/codecs/cs4270.c

··· 234 234 * lower three bits are determined via the AD2, AD1, and AD0 pins 235 235 * (respectively). 236 236 */ 237 - static unsigned short normal_i2c[] = { 237 + static const unsigned short normal_i2c[] = { 238 238 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, I2C_CLIENT_END 239 239 }; 240 240 I2C_CLIENT_INSMOD;

+1 -1

sound/soc/s3c24xx/neo1973_wm8753.c

··· 573 573 574 574 static struct i2c_client client_template; 575 575 576 - static unsigned short normal_i2c[] = { 0x7C, I2C_CLIENT_END }; 576 + static const unsigned short normal_i2c[] = { 0x7C, I2C_CLIENT_END }; 577 577 578 578 /* Magic definition of all other variables and things */ 579 579 I2C_CLIENT_INSMOD;