hwmon: normal_i2c arrays should be const

Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
This commit is contained in:
Mark M. Hoffman 2008-02-17 22:28:03 -05:00
parent 57df46d6d9
commit 25e9c86d5a
41 changed files with 55 additions and 60 deletions

View File

@ -26,7 +26,7 @@
#define DRV_VERSION "0.3" #define DRV_VERSION "0.3"
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x28, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x28, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_3(ad7416, ad7417, ad7418); I2C_CLIENT_INSMOD_3(ad7416, ad7417, ad7418);

View File

@ -31,10 +31,8 @@
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a, static const unsigned short normal_i2c[] = {
0x29, 0x2a, 0x2b, 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
0x4c, 0x4d, 0x4e,
I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, I2C_CLIENT_INSMOD_8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm,

View File

@ -62,7 +62,7 @@
* NE1619 has two possible addresses: 0x2c and 0x2d. * NE1619 has two possible addresses: 0x2c and 0x2d.
*/ */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
/* /*
* Insmod parameters * Insmod parameters

View File

@ -35,7 +35,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(adm1026); I2C_CLIENT_INSMOD_1(adm1026);

View File

@ -39,10 +39,8 @@
* Addresses to scan * Addresses to scan
*/ */
static unsigned short normal_i2c[] = { static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
0x28, 0x29, 0x2a, 0x2e, 0x2f, I2C_CLIENT_END
0x2b, 0x2c, 0x2d,
0x2e, 0x2f, I2C_CLIENT_END
}; };
/* /*

View File

@ -61,7 +61,7 @@
#define ADM1031_CONF2_TEMP_ENABLE(chan) (0x10 << (chan)) #define ADM1031_CONF2_TEMP_ENABLE(chan) (0x10 << (chan))
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_2(adm1030, adm1031); I2C_CLIENT_INSMOD_2(adm1030, adm1031);

View File

@ -52,7 +52,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
I2C_CLIENT_END }; I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */

View File

@ -44,7 +44,7 @@
#define ADS7828_INT_VREF_MV 2500 /* Internal vref is 2.5V, 2500mV */ #define ADS7828_INT_VREF_MV 2500 /* Internal vref is 2.5V, 2500mV */
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
I2C_CLIENT_END }; I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */

View File

@ -30,7 +30,7 @@
#include <linux/log2.h> #include <linux/log2.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(adt7470); I2C_CLIENT_INSMOD_1(adt7470);

View File

@ -30,7 +30,7 @@
#include <linux/log2.h> #include <linux/log2.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2C, 0x2D, 0x2E, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2C, 0x2D, 0x2E, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(adt7473); I2C_CLIENT_INSMOD_1(adt7473);

View File

@ -49,7 +49,7 @@
#include "lm75.h" #include "lm75.h"
/* I2C addresses to scan */ /* I2C addresses to scan */
static unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(asb100); I2C_CLIENT_INSMOD_1(asb100);

View File

@ -42,7 +42,7 @@ MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
#define ATXP1_VIDMASK 0x1f #define ATXP1_VIDMASK 0x1f
#define ATXP1_GPIO1MASK 0x0f #define ATXP1_GPIO1MASK 0x0f
static unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END };
I2C_CLIENT_INSMOD_1(atxp1); I2C_CLIENT_INSMOD_1(atxp1);

View File

@ -49,7 +49,7 @@ module_param(force_id, ushort, 0);
MODULE_PARM_DESC(force_id, "Override the detected device ID"); MODULE_PARM_DESC(force_id, "Override the detected device ID");
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END}; static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END};
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(dme1737); I2C_CLIENT_INSMOD_1(dme1737);

View File

@ -34,7 +34,7 @@
#include "lm75.h" #include "lm75.h"
/* Addresses to scan */ /* 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 }; 0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */

View File

@ -37,7 +37,7 @@
#include <linux/f75375s.h> #include <linux/f75375s.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_2(f75373, f75375); I2C_CLIENT_INSMOD_2(f75373, f75375);

View File

@ -40,7 +40,7 @@
* Addresses to scan * Addresses to scan
*/ */
static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
/* /*
* Insmod parameters * Insmod parameters

View File

@ -44,7 +44,7 @@
#include <linux/dmi.h> #include <linux/dmi.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_5(fscpos, fscher, fscscy, fschrc, fschmd); I2C_CLIENT_INSMOD_5(fscpos, fscher, fscscy, fschrc, fschmd);

View File

@ -43,7 +43,7 @@
/* /*
* Addresses to scan * Addresses to scan
*/ */
static unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END };
/* /*
* Insmod parameters * Insmod parameters

View File

@ -44,7 +44,7 @@
#include <linux/sysfs.h> #include <linux/sysfs.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_2(gl518sm_r00, gl518sm_r80); I2C_CLIENT_INSMOD_2(gl518sm_r00, gl518sm_r80);

View File

@ -39,7 +39,7 @@ module_param(extra_sensor_type, ushort, 0);
MODULE_PARM_DESC(extra_sensor_type, "Type of extra sensor (0=autodetect, 1=temperature, 2=voltage)"); MODULE_PARM_DESC(extra_sensor_type, "Type of extra sensor (0=autodetect, 1=temperature, 2=voltage)");
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(gl520sm); I2C_CLIENT_INSMOD_1(gl520sm);

View File

@ -53,7 +53,7 @@
* Address is fully defined internally and cannot be changed. * Address is fully defined internally and cannot be changed.
*/ */
static unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END };
/* /*
* Insmod parameters * Insmod parameters

View File

@ -31,7 +31,7 @@
/* Addresses to scan */ /* 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 }; 0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */

View File

@ -36,7 +36,8 @@
#include <linux/mutex.h> #include <linux/mutex.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(lm77); I2C_CLIENT_INSMOD_1(lm77);

View File

@ -37,8 +37,8 @@
static struct platform_device *pdev; static struct platform_device *pdev;
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
0x2e, 0x2f, I2C_CLIENT_END }; 0x2e, 0x2f, I2C_CLIENT_END };
static unsigned short isa_address = 0x290; static unsigned short isa_address = 0x290;
/* Insmod parameters */ /* Insmod parameters */

View File

@ -32,8 +32,8 @@
#include <linux/mutex.h> #include <linux/mutex.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
0x2d, 0x2e, 0x2f, I2C_CLIENT_END }; 0x2e, 0x2f, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(lm80); I2C_CLIENT_INSMOD_1(lm80);

View File

@ -48,10 +48,8 @@
* addresses. * addresses.
*/ */
static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a, static const unsigned short normal_i2c[] = {
0x29, 0x2a, 0x2b, 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
0x4c, 0x4d, 0x4e,
I2C_CLIENT_END };
/* /*
* Insmod parameters * Insmod parameters

View File

@ -35,7 +35,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102); I2C_CLIENT_INSMOD_6(lm85b, lm85c, adm1027, adt7463, emc6d100, emc6d102);

View File

@ -73,7 +73,7 @@
* LM87 has three possible addresses: 0x2c, 0x2d and 0x2e. * LM87 has three possible addresses: 0x2c, 0x2d and 0x2e.
*/ */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
/* /*
* Insmod parameters * Insmod parameters

View File

@ -101,10 +101,8 @@
* 0x4c, 0x4d or 0x4e. * 0x4c, 0x4d or 0x4e.
*/ */
static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a, static const unsigned short normal_i2c[] = {
0x29, 0x2a, 0x2b, 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
0x4c, 0x4d, 0x4e,
I2C_CLIENT_END };
/* /*
* Insmod parameters * Insmod parameters

View File

@ -51,8 +51,8 @@
/* The LM92 and MAX6635 have 2 two-state pins for address selection, /* The LM92 and MAX6635 have 2 two-state pins for address selection,
resulting in 4 possible addresses. */ resulting in 4 possible addresses. */
static unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b,
I2C_CLIENT_END }; I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(lm92); I2C_CLIENT_INSMOD_1(lm92);

View File

@ -142,7 +142,7 @@
I2C_FUNC_SMBUS_WORD_DATA) I2C_FUNC_SMBUS_WORD_DATA)
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(lm93); I2C_CLIENT_INSMOD_1(lm93);

View File

@ -37,10 +37,8 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
static unsigned short normal_i2c[] = { 0x18, 0x19, 0x1a, static const unsigned short normal_i2c[] = {
0x29, 0x2a, 0x2b, 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
0x4c, 0x4d, 0x4e,
I2C_CLIENT_END };
/* /*
* Insmod parameters * Insmod parameters

View File

@ -44,7 +44,8 @@
* Addresses to scan. There are four disjoint possibilities, by pin config. * Addresses to scan. There are four disjoint possibilities, by pin config.
*/ */
static unsigned short normal_i2c[] = {0x1b, 0x1f, 0x48, 0x4b, I2C_CLIENT_END}; static const unsigned short normal_i2c[] = {0x1b, 0x1f, 0x48, 0x4b,
I2C_CLIENT_END};
/* /*
* Insmod parameters * Insmod parameters

View File

@ -34,7 +34,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(smsc47m192); I2C_CLIENT_INSMOD_1(smsc47m192);

View File

@ -32,7 +32,7 @@
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_2(thmc50, adm1022); I2C_CLIENT_INSMOD_2(thmc50, adm1022);

View File

@ -53,8 +53,8 @@
static struct platform_device *pdev; static struct platform_device *pdev;
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
0x2e, 0x2f, I2C_CLIENT_END }; 0x2e, 0x2f, I2C_CLIENT_END };
static unsigned short isa_address = 0x290; static unsigned short isa_address = 0x290;
/* Insmod parameters */ /* Insmod parameters */

View File

@ -47,7 +47,8 @@
#define NUMBER_OF_TEMPIN 3 #define NUMBER_OF_TEMPIN 3
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(w83791d); I2C_CLIENT_INSMOD_1(w83791d);

View File

@ -46,7 +46,8 @@
#include <linux/sysfs.h> #include <linux/sysfs.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(w83792d); I2C_CLIENT_INSMOD_1(w83792d);

View File

@ -37,7 +37,8 @@
#include <linux/mutex.h> #include <linux/mutex.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f,
I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(w83793); I2C_CLIENT_INSMOD_1(w83793);

View File

@ -49,7 +49,7 @@
* Address is fully defined internally and cannot be changed. * Address is fully defined internally and cannot be changed.
*/ */
static unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };
/* /*
* Insmod parameters * Insmod parameters

View File

@ -35,7 +35,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x2e, 0x2f, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2e, 0x2f, I2C_CLIENT_END };
/* Insmod parameters */ /* Insmod parameters */
I2C_CLIENT_INSMOD_1(w83l786ng); I2C_CLIENT_INSMOD_1(w83l786ng);