diff options
Diffstat (limited to 'drivers/hwmon/atxp1.c')
-rw-r--r-- | drivers/hwmon/atxp1.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c index d6b490d3e36f..94cadc19f0c5 100644 --- a/drivers/hwmon/atxp1.c +++ b/drivers/hwmon/atxp1.c | |||
@@ -44,17 +44,14 @@ MODULE_AUTHOR("Sebastian Witt <se.witt@gmx.net>"); | |||
44 | 44 | ||
45 | static const unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END }; | 45 | static const unsigned short normal_i2c[] = { 0x37, 0x4e, I2C_CLIENT_END }; |
46 | 46 | ||
47 | I2C_CLIENT_INSMOD_1(atxp1); | ||
48 | |||
49 | static int atxp1_probe(struct i2c_client *client, | 47 | static int atxp1_probe(struct i2c_client *client, |
50 | const struct i2c_device_id *id); | 48 | const struct i2c_device_id *id); |
51 | static int atxp1_remove(struct i2c_client *client); | 49 | static int atxp1_remove(struct i2c_client *client); |
52 | static struct atxp1_data * atxp1_update_device(struct device *dev); | 50 | static struct atxp1_data * atxp1_update_device(struct device *dev); |
53 | static int atxp1_detect(struct i2c_client *client, int kind, | 51 | static int atxp1_detect(struct i2c_client *client, struct i2c_board_info *info); |
54 | struct i2c_board_info *info); | ||
55 | 52 | ||
56 | static const struct i2c_device_id atxp1_id[] = { | 53 | static const struct i2c_device_id atxp1_id[] = { |
57 | { "atxp1", atxp1 }, | 54 | { "atxp1", 0 }, |
58 | { } | 55 | { } |
59 | }; | 56 | }; |
60 | MODULE_DEVICE_TABLE(i2c, atxp1_id); | 57 | MODULE_DEVICE_TABLE(i2c, atxp1_id); |
@@ -68,7 +65,7 @@ static struct i2c_driver atxp1_driver = { | |||
68 | .remove = atxp1_remove, | 65 | .remove = atxp1_remove, |
69 | .id_table = atxp1_id, | 66 | .id_table = atxp1_id, |
70 | .detect = atxp1_detect, | 67 | .detect = atxp1_detect, |
71 | .address_data = &addr_data, | 68 | .address_list = normal_i2c, |
72 | }; | 69 | }; |
73 | 70 | ||
74 | struct atxp1_data { | 71 | struct atxp1_data { |
@@ -275,7 +272,7 @@ static const struct attribute_group atxp1_group = { | |||
275 | 272 | ||
276 | 273 | ||
277 | /* Return 0 if detection is successful, -ENODEV otherwise */ | 274 | /* Return 0 if detection is successful, -ENODEV otherwise */ |
278 | static int atxp1_detect(struct i2c_client *new_client, int kind, | 275 | static int atxp1_detect(struct i2c_client *new_client, |
279 | struct i2c_board_info *info) | 276 | struct i2c_board_info *info) |
280 | { | 277 | { |
281 | struct i2c_adapter *adapter = new_client->adapter; | 278 | struct i2c_adapter *adapter = new_client->adapter; |