diff options
Diffstat (limited to 'drivers/hwmon/gl518sm.c')
-rw-r--r-- | drivers/hwmon/gl518sm.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c index 1d69458aa0b6..e7ae5743e181 100644 --- a/drivers/hwmon/gl518sm.c +++ b/drivers/hwmon/gl518sm.c | |||
@@ -46,8 +46,7 @@ | |||
46 | /* Addresses to scan */ | 46 | /* Addresses to scan */ |
47 | static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; | 47 | static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END }; |
48 | 48 | ||
49 | /* Insmod parameters */ | 49 | enum chips { gl518sm_r00, gl518sm_r80 }; |
50 | I2C_CLIENT_INSMOD_2(gl518sm_r00, gl518sm_r80); | ||
51 | 50 | ||
52 | /* Many GL518 constants specified below */ | 51 | /* Many GL518 constants specified below */ |
53 | 52 | ||
@@ -139,8 +138,7 @@ struct gl518_data { | |||
139 | 138 | ||
140 | static int gl518_probe(struct i2c_client *client, | 139 | static int gl518_probe(struct i2c_client *client, |
141 | const struct i2c_device_id *id); | 140 | const struct i2c_device_id *id); |
142 | static int gl518_detect(struct i2c_client *client, int kind, | 141 | static int gl518_detect(struct i2c_client *client, struct i2c_board_info *info); |
143 | struct i2c_board_info *info); | ||
144 | static void gl518_init_client(struct i2c_client *client); | 142 | static void gl518_init_client(struct i2c_client *client); |
145 | static int gl518_remove(struct i2c_client *client); | 143 | static int gl518_remove(struct i2c_client *client); |
146 | static int gl518_read_value(struct i2c_client *client, u8 reg); | 144 | static int gl518_read_value(struct i2c_client *client, u8 reg); |
@@ -163,7 +161,7 @@ static struct i2c_driver gl518_driver = { | |||
163 | .remove = gl518_remove, | 161 | .remove = gl518_remove, |
164 | .id_table = gl518_id, | 162 | .id_table = gl518_id, |
165 | .detect = gl518_detect, | 163 | .detect = gl518_detect, |
166 | .address_data = &addr_data, | 164 | .address_list = normal_i2c, |
167 | }; | 165 | }; |
168 | 166 | ||
169 | /* | 167 | /* |
@@ -484,8 +482,7 @@ static const struct attribute_group gl518_group_r80 = { | |||
484 | */ | 482 | */ |
485 | 483 | ||
486 | /* Return 0 if detection is successful, -ENODEV otherwise */ | 484 | /* Return 0 if detection is successful, -ENODEV otherwise */ |
487 | static int gl518_detect(struct i2c_client *client, int kind, | 485 | static int gl518_detect(struct i2c_client *client, struct i2c_board_info *info) |
488 | struct i2c_board_info *info) | ||
489 | { | 486 | { |
490 | struct i2c_adapter *adapter = client->adapter; | 487 | struct i2c_adapter *adapter = client->adapter; |
491 | int rev; | 488 | int rev; |