diff options
Diffstat (limited to 'drivers/hwmon/smsc47m192.c')
-rw-r--r-- | drivers/hwmon/smsc47m192.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/hwmon/smsc47m192.c b/drivers/hwmon/smsc47m192.c index 4d88c045781c..40b26673d87f 100644 --- a/drivers/hwmon/smsc47m192.c +++ b/drivers/hwmon/smsc47m192.c | |||
@@ -36,9 +36,6 @@ | |||
36 | /* Addresses to scan */ | 36 | /* Addresses to scan */ |
37 | static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; | 37 | static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; |
38 | 38 | ||
39 | /* Insmod parameters */ | ||
40 | I2C_CLIENT_INSMOD_1(smsc47m192); | ||
41 | |||
42 | /* SMSC47M192 registers */ | 39 | /* SMSC47M192 registers */ |
43 | #define SMSC47M192_REG_IN(nr) ((nr)<6 ? (0x20 + (nr)) : \ | 40 | #define SMSC47M192_REG_IN(nr) ((nr)<6 ? (0x20 + (nr)) : \ |
44 | (0x50 + (nr) - 6)) | 41 | (0x50 + (nr) - 6)) |
@@ -115,13 +112,13 @@ struct smsc47m192_data { | |||
115 | 112 | ||
116 | static int smsc47m192_probe(struct i2c_client *client, | 113 | static int smsc47m192_probe(struct i2c_client *client, |
117 | const struct i2c_device_id *id); | 114 | const struct i2c_device_id *id); |
118 | static int smsc47m192_detect(struct i2c_client *client, int kind, | 115 | static int smsc47m192_detect(struct i2c_client *client, |
119 | struct i2c_board_info *info); | 116 | struct i2c_board_info *info); |
120 | static int smsc47m192_remove(struct i2c_client *client); | 117 | static int smsc47m192_remove(struct i2c_client *client); |
121 | static struct smsc47m192_data *smsc47m192_update_device(struct device *dev); | 118 | static struct smsc47m192_data *smsc47m192_update_device(struct device *dev); |
122 | 119 | ||
123 | static const struct i2c_device_id smsc47m192_id[] = { | 120 | static const struct i2c_device_id smsc47m192_id[] = { |
124 | { "smsc47m192", smsc47m192 }, | 121 | { "smsc47m192", 0 }, |
125 | { } | 122 | { } |
126 | }; | 123 | }; |
127 | MODULE_DEVICE_TABLE(i2c, smsc47m192_id); | 124 | MODULE_DEVICE_TABLE(i2c, smsc47m192_id); |
@@ -135,7 +132,7 @@ static struct i2c_driver smsc47m192_driver = { | |||
135 | .remove = smsc47m192_remove, | 132 | .remove = smsc47m192_remove, |
136 | .id_table = smsc47m192_id, | 133 | .id_table = smsc47m192_id, |
137 | .detect = smsc47m192_detect, | 134 | .detect = smsc47m192_detect, |
138 | .address_data = &addr_data, | 135 | .address_list = normal_i2c, |
139 | }; | 136 | }; |
140 | 137 | ||
141 | /* Voltages */ | 138 | /* Voltages */ |
@@ -481,7 +478,7 @@ static void smsc47m192_init_client(struct i2c_client *client) | |||
481 | } | 478 | } |
482 | 479 | ||
483 | /* Return 0 if detection is successful, -ENODEV otherwise */ | 480 | /* Return 0 if detection is successful, -ENODEV otherwise */ |
484 | static int smsc47m192_detect(struct i2c_client *client, int kind, | 481 | static int smsc47m192_detect(struct i2c_client *client, |
485 | struct i2c_board_info *info) | 482 | struct i2c_board_info *info) |
486 | { | 483 | { |
487 | struct i2c_adapter *adapter = client->adapter; | 484 | struct i2c_adapter *adapter = client->adapter; |