diff options
Diffstat (limited to 'drivers/hwmon/adm1029.c')
| -rw-r--r-- | drivers/hwmon/adm1029.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/hwmon/adm1029.c b/drivers/hwmon/adm1029.c index ef91e2a4a567..0b8a3b145bd2 100644 --- a/drivers/hwmon/adm1029.c +++ b/drivers/hwmon/adm1029.c | |||
| @@ -44,12 +44,6 @@ static const unsigned short normal_i2c[] = { 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, | |||
| 44 | }; | 44 | }; |
| 45 | 45 | ||
| 46 | /* | 46 | /* |
| 47 | * Insmod parameters | ||
| 48 | */ | ||
| 49 | |||
| 50 | I2C_CLIENT_INSMOD_1(adm1029); | ||
| 51 | |||
| 52 | /* | ||
| 53 | * The ADM1029 registers | 47 | * The ADM1029 registers |
| 54 | * Manufacturer ID is 0x41 for Analog Devices | 48 | * Manufacturer ID is 0x41 for Analog Devices |
| 55 | */ | 49 | */ |
| @@ -117,7 +111,7 @@ static const u8 ADM1029_REG_FAN_DIV[] = { | |||
| 117 | 111 | ||
| 118 | static int adm1029_probe(struct i2c_client *client, | 112 | static int adm1029_probe(struct i2c_client *client, |
| 119 | const struct i2c_device_id *id); | 113 | const struct i2c_device_id *id); |
| 120 | static int adm1029_detect(struct i2c_client *client, int kind, | 114 | static int adm1029_detect(struct i2c_client *client, |
| 121 | struct i2c_board_info *info); | 115 | struct i2c_board_info *info); |
| 122 | static int adm1029_remove(struct i2c_client *client); | 116 | static int adm1029_remove(struct i2c_client *client); |
| 123 | static struct adm1029_data *adm1029_update_device(struct device *dev); | 117 | static struct adm1029_data *adm1029_update_device(struct device *dev); |
| @@ -128,7 +122,7 @@ static int adm1029_init_client(struct i2c_client *client); | |||
| 128 | */ | 122 | */ |
| 129 | 123 | ||
| 130 | static const struct i2c_device_id adm1029_id[] = { | 124 | static const struct i2c_device_id adm1029_id[] = { |
| 131 | { "adm1029", adm1029 }, | 125 | { "adm1029", 0 }, |
| 132 | { } | 126 | { } |
| 133 | }; | 127 | }; |
| 134 | MODULE_DEVICE_TABLE(i2c, adm1029_id); | 128 | MODULE_DEVICE_TABLE(i2c, adm1029_id); |
| @@ -142,7 +136,7 @@ static struct i2c_driver adm1029_driver = { | |||
| 142 | .remove = adm1029_remove, | 136 | .remove = adm1029_remove, |
| 143 | .id_table = adm1029_id, | 137 | .id_table = adm1029_id, |
| 144 | .detect = adm1029_detect, | 138 | .detect = adm1029_detect, |
| 145 | .address_data = &addr_data, | 139 | .address_list = normal_i2c, |
| 146 | }; | 140 | }; |
| 147 | 141 | ||
| 148 | /* | 142 | /* |
| @@ -297,7 +291,7 @@ static const struct attribute_group adm1029_group = { | |||
| 297 | */ | 291 | */ |
| 298 | 292 | ||
| 299 | /* Return 0 if detection is successful, -ENODEV otherwise */ | 293 | /* Return 0 if detection is successful, -ENODEV otherwise */ |
| 300 | static int adm1029_detect(struct i2c_client *client, int kind, | 294 | static int adm1029_detect(struct i2c_client *client, |
| 301 | struct i2c_board_info *info) | 295 | struct i2c_board_info *info) |
| 302 | { | 296 | { |
| 303 | struct i2c_adapter *adapter = client->adapter; | 297 | struct i2c_adapter *adapter = client->adapter; |
