Commit 1f86df49 authored by Jean Delvare's avatar Jean Delvare
Browse files

i2c: Drop I2C_CLIENT_INSMOD_1



This macro simply declares an enum, so drivers might as well declare
it themselves.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Tested-by: default avatarWolfram Sang <w.sang@pengutronix.de>
parent c3813d6a
...@@ -37,9 +37,6 @@ ...@@ -37,9 +37,6 @@
/* Addresses to scan */ /* Addresses to scan */
static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
/* Insmod parameters */
I2C_CLIENT_INSMOD_1(adm1026);
static int gpio_input[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, static int gpio_input[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1 }; -1, -1, -1, -1, -1, -1, -1, -1 };
static int gpio_output[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, static int gpio_output[17] = { -1, -1, -1, -1, -1, -1, -1, -1, -1,
...@@ -305,7 +302,7 @@ static void adm1026_init_client(struct i2c_client *client); ...@@ -305,7 +302,7 @@ static void adm1026_init_client(struct i2c_client *client);
static const struct i2c_device_id adm1026_id[] = { static const struct i2c_device_id adm1026_id[] = {
{ "adm1026", adm1026 }, { "adm1026", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, adm1026_id); MODULE_DEVICE_TABLE(i2c, adm1026_id);
......
...@@ -43,12 +43,6 @@ static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, ...@@ -43,12 +43,6 @@ static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d,
0x2e, 0x2f, I2C_CLIENT_END 0x2e, 0x2f, I2C_CLIENT_END
}; };
/*
* Insmod parameters
*/
I2C_CLIENT_INSMOD_1(adm1029);
/* /*
* The ADM1029 registers * The ADM1029 registers
* Manufacturer ID is 0x41 for Analog Devices * Manufacturer ID is 0x41 for Analog Devices
...@@ -128,7 +122,7 @@ static int adm1029_init_client(struct i2c_client *client); ...@@ -128,7 +122,7 @@ static int adm1029_init_client(struct i2c_client *client);
*/ */
static const struct i2c_device_id adm1029_id[] = { static const struct i2c_device_id adm1029_id[] = {
{ "adm1029", adm1029 }, { "adm1029", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, adm1029_id); MODULE_DEVICE_TABLE(i2c, adm1029_id);
......
...@@ -47,10 +47,7 @@ ...@@ -47,10 +47,7 @@
static const 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 */ /* Module parameters */
I2C_CLIENT_INSMOD_1(ads7828);
/* Other module parameters */
static int se_input = 1; /* Default is SE, 0 == diff */ static int se_input = 1; /* Default is SE, 0 == diff */
static int int_vref = 1; /* Default is internal ref ON */ static int int_vref = 1; /* Default is internal ref ON */
static int vref_mv = ADS7828_INT_VREF_MV; /* set if vref != 2.5V */ static int vref_mv = ADS7828_INT_VREF_MV; /* set if vref != 2.5V */
...@@ -168,7 +165,7 @@ static int ads7828_remove(struct i2c_client *client) ...@@ -168,7 +165,7 @@ static int ads7828_remove(struct i2c_client *client)
} }
static const struct i2c_device_id ads7828_id[] = { static const struct i2c_device_id ads7828_id[] = {
{ "ads7828", ads7828 }, { "ads7828", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, ads7828_id); MODULE_DEVICE_TABLE(i2c, ads7828_id);
......
...@@ -32,9 +32,6 @@ ...@@ -32,9 +32,6 @@
/* Addresses to scan */ /* Addresses to scan */
static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END };
/* Insmod parameters */
I2C_CLIENT_INSMOD_1(adt7462);
/* ADT7462 registers */ /* ADT7462 registers */
#define ADT7462_REG_DEVICE 0x3D #define ADT7462_REG_DEVICE 0x3D
#define ADT7462_REG_VENDOR 0x3E #define ADT7462_REG_VENDOR 0x3E
...@@ -242,7 +239,7 @@ static int adt7462_detect(struct i2c_client *client, ...@@ -242,7 +239,7 @@ static int adt7462_detect(struct i2c_client *client,
static int adt7462_remove(struct i2c_client *client); static int adt7462_remove(struct i2c_client *client);
static const struct i2c_device_id adt7462_id[] = { static const struct i2c_device_id adt7462_id[] = {
{ "adt7462", adt7462 }, { "adt7462", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, adt7462_id); MODULE_DEVICE_TABLE(i2c, adt7462_id);
......
...@@ -33,9 +33,6 @@ ...@@ -33,9 +33,6 @@
/* Addresses to scan */ /* Addresses to scan */
static const unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END };
/* Insmod parameters */
I2C_CLIENT_INSMOD_1(adt7470);
/* ADT7470 registers */ /* ADT7470 registers */
#define ADT7470_REG_BASE_ADDR 0x20 #define ADT7470_REG_BASE_ADDR 0x20
#define ADT7470_REG_TEMP_BASE_ADDR 0x20 #define ADT7470_REG_TEMP_BASE_ADDR 0x20
...@@ -182,7 +179,7 @@ static int adt7470_detect(struct i2c_client *client, ...@@ -182,7 +179,7 @@ static int adt7470_detect(struct i2c_client *client,
static int adt7470_remove(struct i2c_client *client); static int adt7470_remove(struct i2c_client *client);
static const struct i2c_device_id adt7470_id[] = { static const struct i2c_device_id adt7470_id[] = {
{ "adt7470", adt7470 }, { "adt7470", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, adt7470_id); MODULE_DEVICE_TABLE(i2c, adt7470_id);
......
...@@ -32,9 +32,6 @@ ...@@ -32,9 +32,6 @@
/* Addresses to scan */ /* Addresses to scan */
static const unsigned short normal_i2c[] = { 0x2C, 0x2D, 0x2E, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2C, 0x2D, 0x2E, I2C_CLIENT_END };
/* Insmod parameters */
I2C_CLIENT_INSMOD_1(adt7473);
/* ADT7473 registers */ /* ADT7473 registers */
#define ADT7473_REG_BASE_ADDR 0x20 #define ADT7473_REG_BASE_ADDR 0x20
...@@ -171,7 +168,7 @@ static int adt7473_detect(struct i2c_client *client, ...@@ -171,7 +168,7 @@ static int adt7473_detect(struct i2c_client *client,
static int adt7473_remove(struct i2c_client *client); static int adt7473_remove(struct i2c_client *client);
static const struct i2c_device_id adt7473_id[] = { static const struct i2c_device_id adt7473_id[] = {
{ "adt7473", adt7473 }, { "adt7473", 0 },
{ } { }
}; };
......
...@@ -51,9 +51,6 @@ ...@@ -51,9 +51,6 @@
/* I2C addresses to scan */ /* I2C addresses to scan */
static const unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END };
/* Insmod parameters */
I2C_CLIENT_INSMOD_1(asb100);
static unsigned short force_subclients[4]; static unsigned short force_subclients[4];
module_param_array(force_subclients, short, NULL, 0); module_param_array(force_subclients, short, NULL, 0);
MODULE_PARM_DESC(force_subclients, "List of subclient addresses: " MODULE_PARM_DESC(force_subclients, "List of subclient addresses: "
...@@ -216,7 +213,7 @@ static struct asb100_data *asb100_update_device(struct device *dev); ...@@ -216,7 +213,7 @@ static struct asb100_data *asb100_update_device(struct device *dev);
static void asb100_init_client(struct i2c_client *client); static void asb100_init_client(struct i2c_client *client);
static const struct i2c_device_id asb100_id[] = { static const struct i2c_device_id asb100_id[] = {
{ "asb100", asb100 }, { "asb100", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, asb100_id); MODULE_DEVICE_TABLE(i2c, asb100_id);
......
...@@ -44,8 +44,6 @@ MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>"); ...@@ -44,8 +44,6 @@ MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>");
static const 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);
static int atxp1_probe(struct i2c_client *client, static int atxp1_probe(struct i2c_client *client,
const struct i2c_device_id *id); const struct i2c_device_id *id);
static int atxp1_remove(struct i2c_client *client); static int atxp1_remove(struct i2c_client *client);
...@@ -53,7 +51,7 @@ static struct atxp1_data * atxp1_update_device(struct device *dev); ...@@ -53,7 +51,7 @@ static struct atxp1_data * atxp1_update_device(struct device *dev);
static int atxp1_detect(struct i2c_client *client, struct i2c_board_info *info); static int atxp1_detect(struct i2c_client *client, struct i2c_board_info *info);
static const struct i2c_device_id atxp1_id[] = { static const struct i2c_device_id atxp1_id[] = {
{ "atxp1", atxp1 }, { "atxp1", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, atxp1_id); MODULE_DEVICE_TABLE(i2c, atxp1_id);
......
...@@ -38,7 +38,6 @@ static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c, ...@@ -38,7 +38,6 @@ 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 */
I2C_CLIENT_INSMOD_1(ds1621);
static int polarity = -1; static int polarity = -1;
module_param(polarity, int, 0); module_param(polarity, int, 0);
MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low"); MODULE_PARM_DESC(polarity, "Output's polarity: 0 = active high, 1 = active low");
...@@ -305,8 +304,8 @@ static int ds1621_remove(struct i2c_client *client) ...@@ -305,8 +304,8 @@ static int ds1621_remove(struct i2c_client *client)
} }
static const struct i2c_device_id ds1621_id[] = { static const struct i2c_device_id ds1621_id[] = {
{ "ds1621", ds1621 }, { "ds1621", 0 },
{ "ds1625", ds1621 }, { "ds1625", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, ds1621_id); MODULE_DEVICE_TABLE(i2c, ds1621_id);
......
...@@ -41,9 +41,6 @@ MODULE_PARM_DESC(extra_sensor_type, "Type of extra sensor (0=autodetect, 1=tempe ...@@ -41,9 +41,6 @@ MODULE_PARM_DESC(extra_sensor_type, "Type of extra sensor (0=autodetect, 1=tempe
/* Addresses to scan */ /* Addresses to scan */
static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };
/* Insmod parameters */
I2C_CLIENT_INSMOD_1(gl520sm);
/* Many GL520 constants specified below /* Many GL520 constants specified below
One of the inputs can be configured as either temp or voltage. One of the inputs can be configured as either temp or voltage.
That's why _TEMP2 and _IN4 access the same register That's why _TEMP2 and _IN4 access the same register
...@@ -90,7 +87,7 @@ static struct gl520_data *gl520_update_device(struct device *dev); ...@@ -90,7 +87,7 @@ static struct gl520_data *gl520_update_device(struct device *dev);
/* Driver data */ /* Driver data */
static const struct i2c_device_id gl520_id[] = { static const struct i2c_device_id gl520_id[] = {
{ "gl520sm", gl520sm }, { "gl520sm", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, gl520_id); MODULE_DEVICE_TABLE(i2c, gl520_id);
......
...@@ -55,12 +55,6 @@ ...@@ -55,12 +55,6 @@
static const unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END };
/*
* Insmod parameters
*/
I2C_CLIENT_INSMOD_1(lm63);
/* /*
* The LM63 registers * The LM63 registers
*/ */
...@@ -142,7 +136,7 @@ static void lm63_init_client(struct i2c_client *client); ...@@ -142,7 +136,7 @@ static void lm63_init_client(struct i2c_client *client);
*/ */
static const struct i2c_device_id lm63_id[] = { static const struct i2c_device_id lm63_id[] = {
{ "lm63", lm63 }, { "lm63", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, lm63_id); MODULE_DEVICE_TABLE(i2c, lm63_id);
......
...@@ -27,9 +27,6 @@ ...@@ -27,9 +27,6 @@
static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4c, static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4c,
0x4d, 0x4e, I2C_CLIENT_END }; 0x4d, 0x4e, I2C_CLIENT_END };
/* Insmod parameters */
I2C_CLIENT_INSMOD_1(lm73);
/* LM73 registers */ /* LM73 registers */
#define LM73_REG_INPUT 0x00 #define LM73_REG_INPUT 0x00
#define LM73_REG_CONF 0x01 #define LM73_REG_CONF 0x01
...@@ -145,7 +142,7 @@ static int lm73_remove(struct i2c_client *client) ...@@ -145,7 +142,7 @@ static int lm73_remove(struct i2c_client *client)
} }
static const struct i2c_device_id lm73_ids[] = { static const struct i2c_device_id lm73_ids[] = {
{ "lm73", lm73 }, { "lm73", 0 },
{ /* LIST END */ } { /* LIST END */ }
}; };
MODULE_DEVICE_TABLE(i2c, lm73_ids); MODULE_DEVICE_TABLE(i2c, lm73_ids);
......
...@@ -32,15 +32,12 @@ ...@@ -32,15 +32,12 @@
/* /*
* This driver handles the LM75 and compatible digital temperature sensors. * This driver handles the LM75 and compatible digital temperature sensors.
* Only types which are _not_ listed in I2C_CLIENT_INSMOD_*() need to be
* listed here. We start at 9 since I2C_CLIENT_INSMOD_*() currently allow
* definition of up to 8 chip types (plus zero).
*/ */
enum lm75_type { /* keep sorted in alphabetical order */ enum lm75_type { /* keep sorted in alphabetical order */
ds1775 = 9, ds1775,
ds75, ds75,
/* lm75 -- in I2C_CLIENT_INSMOD_1() */ lm75,
lm75a, lm75a,
max6625, max6625,
max6626, max6626,
...@@ -58,9 +55,6 @@ enum lm75_type { /* keep sorted in alphabetical order */ ...@@ -58,9 +55,6 @@ enum lm75_type { /* keep sorted in alphabetical order */
static const 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 */
I2C_CLIENT_INSMOD_1(lm75);
/* The LM75 registers */ /* The LM75 registers */
#define LM75_REG_CONF 0x01 #define LM75_REG_CONF 0x01
......
...@@ -39,9 +39,6 @@ ...@@ -39,9 +39,6 @@
static const 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 */
I2C_CLIENT_INSMOD_1(lm77);
/* The LM77 registers */ /* The LM77 registers */
#define LM77_REG_TEMP 0x00 #define LM77_REG_TEMP 0x00
#define LM77_REG_CONF 0x01 #define LM77_REG_CONF 0x01
...@@ -76,7 +73,7 @@ static struct lm77_data *lm77_update_device(struct device *dev); ...@@ -76,7 +73,7 @@ static struct lm77_data *lm77_update_device(struct device *dev);
static const struct i2c_device_id lm77_id[] = { static const struct i2c_device_id lm77_id[] = {
{ "lm77", lm77 }, { "lm77", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, lm77_id); MODULE_DEVICE_TABLE(i2c, lm77_id);
......
...@@ -35,9 +35,6 @@ ...@@ -35,9 +35,6 @@
static const 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 };
/* Insmod parameters */
I2C_CLIENT_INSMOD_1(lm80);
/* Many LM80 constants specified below */ /* Many LM80 constants specified below */
/* The LM80 registers */ /* The LM80 registers */
...@@ -145,7 +142,7 @@ static int lm80_write_value(struct i2c_client *client, u8 reg, u8 value); ...@@ -145,7 +142,7 @@ static int lm80_write_value(struct i2c_client *client, u8 reg, u8 value);
*/ */
static const struct i2c_device_id lm80_id[] = { static const struct i2c_device_id lm80_id[] = {
{ "lm80", lm80 }, { "lm80", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, lm80_id); MODULE_DEVICE_TABLE(i2c, lm80_id);
......
...@@ -54,9 +54,6 @@ ...@@ -54,9 +54,6 @@
static const 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 */
I2C_CLIENT_INSMOD_1(lm92);
/* The LM92 registers */ /* The LM92 registers */
#define LM92_REG_CONFIG 0x01 /* 8-bit, RW */ #define LM92_REG_CONFIG 0x01 /* 8-bit, RW */
#define LM92_REG_TEMP 0x00 /* 16-bit, RO */ #define LM92_REG_TEMP 0x00 /* 16-bit, RO */
...@@ -401,7 +398,7 @@ static int lm92_remove(struct i2c_client *client) ...@@ -401,7 +398,7 @@ static int lm92_remove(struct i2c_client *client)
*/ */
static const struct i2c_device_id lm92_id[] = { static const struct i2c_device_id lm92_id[] = {
{ "lm92", lm92 }, { "lm92", 0 },
/* max6635 could be added here */ /* max6635 could be added here */
{ } { }
}; };
......
...@@ -145,7 +145,6 @@ ...@@ -145,7 +145,6 @@
static const 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);
static int disable_block; static int disable_block;
module_param(disable_block, bool, 0); module_param(disable_block, bool, 0);
...@@ -2602,7 +2601,7 @@ static int lm93_remove(struct i2c_client *client) ...@@ -2602,7 +2601,7 @@ static int lm93_remove(struct i2c_client *client)
} }
static const struct i2c_device_id lm93_id[] = { static const struct i2c_device_id lm93_id[] = {
{ "lm93", lm93 }, { "lm93", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, lm93_id); MODULE_DEVICE_TABLE(i2c, lm93_id);
......
...@@ -39,9 +39,6 @@ ...@@ -39,9 +39,6 @@
static const unsigned short normal_i2c[] = { static const unsigned short normal_i2c[] = {
0x19, 0x2a, 0x2b, I2C_CLIENT_END}; 0x19, 0x2a, 0x2b, I2C_CLIENT_END};
/* Insmod parameters */
I2C_CLIENT_INSMOD_1(lm95241);
/* LM95241 registers */ /* LM95241 registers */
#define LM95241_REG_R_MAN_ID 0xFE #define LM95241_REG_R_MAN_ID 0xFE
#define LM95241_REG_R_CHIP_ID 0xFF #define LM95241_REG_R_CHIP_ID 0xFF
...@@ -446,7 +443,7 @@ static struct lm95241_data *lm95241_update_device(struct device *dev) ...@@ -446,7 +443,7 @@ static struct lm95241_data *lm95241_update_device(struct device *dev)
/* Driver data (common to all clients) */ /* Driver data (common to all clients) */
static const struct i2c_device_id lm95241_id[] = { static const struct i2c_device_id lm95241_id[] = {
{ "lm95241", lm95241 }, { "lm95241", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, lm95241_id); MODULE_DEVICE_TABLE(i2c, lm95241_id);
......
...@@ -40,12 +40,6 @@ ...@@ -40,12 +40,6 @@
static const unsigned short normal_i2c[] = { static const unsigned short normal_i2c[] = {
0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END }; 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, 0x4d, 0x4e, I2C_CLIENT_END };
/*
* Insmod parameters
*/
I2C_CLIENT_INSMOD_1(max1619);
/* /*
* The MAX1619 registers * The MAX1619 registers
*/ */
...@@ -99,7 +93,7 @@ static struct max1619_data *max1619_update_device(struct device *dev); ...@@ -99,7 +93,7 @@ static struct max1619_data *max1619_update_device(struct device *dev);
*/ */
static const struct i2c_device_id max1619_id[] = { static const struct i2c_device_id max1619_id[] = {
{ "max1619", max1619 }, { "max1619", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, max1619_id); MODULE_DEVICE_TABLE(i2c, max1619_id);
......
...@@ -62,8 +62,6 @@ module_param(fan_voltage, int, S_IRUGO); ...@@ -62,8 +62,6 @@ module_param(fan_voltage, int, S_IRUGO);
module_param(prescaler, int, S_IRUGO); module_param(prescaler, int, S_IRUGO);
module_param(clock, int, S_IRUGO); module_param(clock, int, S_IRUGO);
I2C_CLIENT_INSMOD_1(max6650);
/* /*
* MAX 6650/6651 registers * MAX 6650/6651 registers
*/ */
...@@ -127,7 +125,7 @@ static struct max6650_data *max6650_update_device(struct device *dev); ...@@ -127,7 +125,7 @@ static struct max6650_data *max6650_update_device(struct device *dev);
*/ */
static const struct i2c_device_id max6650_id[] = { static const struct i2c_device_id max6650_id[] = {
{ "max6650", max6650 }, { "max6650", 0 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, max6650_id); MODULE_DEVICE_TABLE(i2c, max6650_id);
......
...@@ -29,7 +29,6 @@ static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c, ...@@ -29,7 +29,6 @@ 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 */
I2C_CLIENT_INSMOD_1(pcf8591);
static int input_mode; static int input_mode;
module_param(input_mode, int, 0); module_param(input_mode, int, 0);
......
...@@ -36,9 +36,6 @@ ...@@ -36,9 +36,6 @@
/* Addresses to scan */ /* Addresses to scan */
static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };