diff options
author | Guenter Roeck <linux@roeck-us.net> | 2013-01-10 13:01:24 -0500 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2013-04-08 00:16:40 -0400 |
commit | b55f375725ff85aada394da488802b0a3cc99e88 (patch) | |
tree | 571a8883b647a53901e102ee24c5c21cab342f49 /drivers | |
parent | 088ce2ac9ebac5c74faf4d39083627875fa6f0f0 (diff) |
hwmon: Fix checkpatch warning 'quoted string split across lines'
Cc: Corentin Labbe <corentin.labbe@geomatys.fr>
Cc: Mark M. Hoffman <mhoffman@lightlink.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Juerg Haefliger <juergh@gmail.com>
Cc: Andreas Herrmann <herrmann.der.user@googlemail.com>
Cc: Rudolf Marek <r.marek@assembler.cz>
Cc: Jim Cromie <jim.cromie@gmail.com>
Cc: Roger Lucas <vt8231@hiddenengine.co.uk>
Cc: Marc Hulsman <m.hulsman@tudelft.nl>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers')
36 files changed, 271 insertions, 249 deletions
diff --git a/drivers/hwmon/ad7314.c b/drivers/hwmon/ad7314.c index a57584d28a40..f3c60019a536 100644 --- a/drivers/hwmon/ad7314.c +++ b/drivers/hwmon/ad7314.c | |||
@@ -166,6 +166,5 @@ static struct spi_driver ad7314_driver = { | |||
166 | module_spi_driver(ad7314_driver); | 166 | module_spi_driver(ad7314_driver); |
167 | 167 | ||
168 | MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>"); | 168 | MODULE_AUTHOR("Sonic Zhang <sonic.zhang@analog.com>"); |
169 | MODULE_DESCRIPTION("Analog Devices AD7314, ADT7301 and ADT7302 digital" | 169 | MODULE_DESCRIPTION("Analog Devices AD7314, ADT7301 and ADT7302 digital temperature sensor driver"); |
170 | " temperature sensor driver"); | ||
171 | MODULE_LICENSE("GPL v2"); | 170 | MODULE_LICENSE("GPL v2"); |
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c index 71bcba8abfc0..7e76922a4ba9 100644 --- a/drivers/hwmon/adm1021.c +++ b/drivers/hwmon/adm1021.c | |||
@@ -312,8 +312,7 @@ static int adm1021_detect(struct i2c_client *client, | |||
312 | int conv_rate, status, config, man_id, dev_id; | 312 | int conv_rate, status, config, man_id, dev_id; |
313 | 313 | ||
314 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { | 314 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { |
315 | pr_debug("adm1021: detect failed, " | 315 | pr_debug("detect failed, smbus byte data not supported!\n"); |
316 | "smbus byte data not supported!\n"); | ||
317 | return -ENODEV; | 316 | return -ENODEV; |
318 | } | 317 | } |
319 | 318 | ||
@@ -324,7 +323,7 @@ static int adm1021_detect(struct i2c_client *client, | |||
324 | 323 | ||
325 | /* Check unused bits */ | 324 | /* Check unused bits */ |
326 | if ((status & 0x03) || (config & 0x3F) || (conv_rate & 0xF8)) { | 325 | if ((status & 0x03) || (config & 0x3F) || (conv_rate & 0xF8)) { |
327 | pr_debug("adm1021: detect failed, chip not detected!\n"); | 326 | pr_debug("detect failed, chip not detected!\n"); |
328 | return -ENODEV; | 327 | return -ENODEV; |
329 | } | 328 | } |
330 | 329 | ||
@@ -353,7 +352,7 @@ static int adm1021_detect(struct i2c_client *client, | |||
353 | else | 352 | else |
354 | type_name = "max1617"; | 353 | type_name = "max1617"; |
355 | 354 | ||
356 | pr_debug("adm1021: Detected chip %s at adapter %d, address 0x%02x.\n", | 355 | pr_debug("Detected chip %s at adapter %d, address 0x%02x.\n", |
357 | type_name, i2c_adapter_id(adapter), client->addr); | 356 | type_name, i2c_adapter_id(adapter), client->addr); |
358 | strlcpy(info->type, type_name, I2C_NAME_SIZE); | 357 | strlcpy(info->type, type_name, I2C_NAME_SIZE); |
359 | 358 | ||
@@ -368,10 +367,8 @@ static int adm1021_probe(struct i2c_client *client, | |||
368 | 367 | ||
369 | data = devm_kzalloc(&client->dev, sizeof(struct adm1021_data), | 368 | data = devm_kzalloc(&client->dev, sizeof(struct adm1021_data), |
370 | GFP_KERNEL); | 369 | GFP_KERNEL); |
371 | if (!data) { | 370 | if (!data) |
372 | pr_debug("adm1021: detect failed, devm_kzalloc failed!\n"); | ||
373 | return -ENOMEM; | 371 | return -ENOMEM; |
374 | } | ||
375 | 372 | ||
376 | i2c_set_clientdata(client, data); | 373 | i2c_set_clientdata(client, data); |
377 | data->type = id->driver_data; | 374 | data->type = id->driver_data; |
diff --git a/drivers/hwmon/adm1026.c b/drivers/hwmon/adm1026.c index ea09046e651d..3a6d9ef1c16c 100644 --- a/drivers/hwmon/adm1026.c +++ b/drivers/hwmon/adm1026.c | |||
@@ -49,14 +49,14 @@ static int gpio_fan[8] = { -1, -1, -1, -1, -1, -1, -1, -1 }; | |||
49 | module_param_array(gpio_input, int, NULL, 0); | 49 | module_param_array(gpio_input, int, NULL, 0); |
50 | MODULE_PARM_DESC(gpio_input, "List of GPIO pins (0-16) to program as inputs"); | 50 | MODULE_PARM_DESC(gpio_input, "List of GPIO pins (0-16) to program as inputs"); |
51 | module_param_array(gpio_output, int, NULL, 0); | 51 | module_param_array(gpio_output, int, NULL, 0); |
52 | MODULE_PARM_DESC(gpio_output, "List of GPIO pins (0-16) to program as " | 52 | MODULE_PARM_DESC(gpio_output, |
53 | "outputs"); | 53 | "List of GPIO pins (0-16) to program as outputs"); |
54 | module_param_array(gpio_inverted, int, NULL, 0); | 54 | module_param_array(gpio_inverted, int, NULL, 0); |
55 | MODULE_PARM_DESC(gpio_inverted, "List of GPIO pins (0-16) to program as " | 55 | MODULE_PARM_DESC(gpio_inverted, |
56 | "inverted"); | 56 | "List of GPIO pins (0-16) to program as inverted"); |
57 | module_param_array(gpio_normal, int, NULL, 0); | 57 | module_param_array(gpio_normal, int, NULL, 0); |
58 | MODULE_PARM_DESC(gpio_normal, "List of GPIO pins (0-16) to program as " | 58 | MODULE_PARM_DESC(gpio_normal, |
59 | "normal/non-inverted"); | 59 | "List of GPIO pins (0-16) to program as normal/non-inverted"); |
60 | module_param_array(gpio_fan, int, NULL, 0); | 60 | module_param_array(gpio_fan, int, NULL, 0); |
61 | MODULE_PARM_DESC(gpio_fan, "List of GPIO pins (0-7) to program as fan tachs"); | 61 | MODULE_PARM_DESC(gpio_fan, "List of GPIO pins (0-7) to program as fan tachs"); |
62 | 62 | ||
@@ -372,31 +372,31 @@ static void adm1026_init_client(struct i2c_client *client) | |||
372 | dev_dbg(&client->dev, "ADM1026_REG_CONFIG1 is: 0x%02x\n", | 372 | dev_dbg(&client->dev, "ADM1026_REG_CONFIG1 is: 0x%02x\n", |
373 | data->config1); | 373 | data->config1); |
374 | if ((data->config1 & CFG1_MONITOR) == 0) { | 374 | if ((data->config1 & CFG1_MONITOR) == 0) { |
375 | dev_dbg(&client->dev, "Monitoring not currently " | 375 | dev_dbg(&client->dev, |
376 | "enabled.\n"); | 376 | "Monitoring not currently enabled.\n"); |
377 | } | 377 | } |
378 | if (data->config1 & CFG1_INT_ENABLE) { | 378 | if (data->config1 & CFG1_INT_ENABLE) { |
379 | dev_dbg(&client->dev, "SMBALERT interrupts are " | 379 | dev_dbg(&client->dev, |
380 | "enabled.\n"); | 380 | "SMBALERT interrupts are enabled.\n"); |
381 | } | 381 | } |
382 | if (data->config1 & CFG1_AIN8_9) { | 382 | if (data->config1 & CFG1_AIN8_9) { |
383 | dev_dbg(&client->dev, "in8 and in9 enabled. " | 383 | dev_dbg(&client->dev, |
384 | "temp3 disabled.\n"); | 384 | "in8 and in9 enabled. temp3 disabled.\n"); |
385 | } else { | 385 | } else { |
386 | dev_dbg(&client->dev, "temp3 enabled. in8 and " | 386 | dev_dbg(&client->dev, |
387 | "in9 disabled.\n"); | 387 | "temp3 enabled. in8 and in9 disabled.\n"); |
388 | } | 388 | } |
389 | if (data->config1 & CFG1_THERM_HOT) { | 389 | if (data->config1 & CFG1_THERM_HOT) { |
390 | dev_dbg(&client->dev, "Automatic THERM, PWM, " | 390 | dev_dbg(&client->dev, |
391 | "and temp limits enabled.\n"); | 391 | "Automatic THERM, PWM, and temp limits enabled.\n"); |
392 | } | 392 | } |
393 | 393 | ||
394 | if (data->config3 & CFG3_GPIO16_ENABLE) { | 394 | if (data->config3 & CFG3_GPIO16_ENABLE) { |
395 | dev_dbg(&client->dev, "GPIO16 enabled. THERM " | 395 | dev_dbg(&client->dev, |
396 | "pin disabled.\n"); | 396 | "GPIO16 enabled. THERM pin disabled.\n"); |
397 | } else { | 397 | } else { |
398 | dev_dbg(&client->dev, "THERM pin enabled. " | 398 | dev_dbg(&client->dev, |
399 | "GPIO16 disabled.\n"); | 399 | "THERM pin enabled. GPIO16 disabled.\n"); |
400 | } | 400 | } |
401 | if (data->config3 & CFG3_VREF_250) | 401 | if (data->config3 & CFG3_VREF_250) |
402 | dev_dbg(&client->dev, "Vref is 2.50 Volts.\n"); | 402 | dev_dbg(&client->dev, "Vref is 2.50 Volts.\n"); |
@@ -1798,8 +1798,8 @@ static int adm1026_detect(struct i2c_client *client, | |||
1798 | company = adm1026_read_value(client, ADM1026_REG_COMPANY); | 1798 | company = adm1026_read_value(client, ADM1026_REG_COMPANY); |
1799 | verstep = adm1026_read_value(client, ADM1026_REG_VERSTEP); | 1799 | verstep = adm1026_read_value(client, ADM1026_REG_VERSTEP); |
1800 | 1800 | ||
1801 | dev_dbg(&adapter->dev, "Detecting device at %d,0x%02x with" | 1801 | dev_dbg(&adapter->dev, |
1802 | " COMPANY: 0x%02x and VERSTEP: 0x%02x\n", | 1802 | "Detecting device at %d,0x%02x with COMPANY: 0x%02x and VERSTEP: 0x%02x\n", |
1803 | i2c_adapter_id(client->adapter), client->addr, | 1803 | i2c_adapter_id(client->adapter), client->addr, |
1804 | company, verstep); | 1804 | company, verstep); |
1805 | 1805 | ||
@@ -1811,11 +1811,12 @@ static int adm1026_detect(struct i2c_client *client, | |||
1811 | /* Analog Devices ADM1026 */ | 1811 | /* Analog Devices ADM1026 */ |
1812 | } else if (company == ADM1026_COMPANY_ANALOG_DEV | 1812 | } else if (company == ADM1026_COMPANY_ANALOG_DEV |
1813 | && (verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) { | 1813 | && (verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) { |
1814 | dev_err(&adapter->dev, "Unrecognized stepping " | 1814 | dev_err(&adapter->dev, |
1815 | "0x%02x. Defaulting to ADM1026.\n", verstep); | 1815 | "Unrecognized stepping 0x%02x. Defaulting to ADM1026.\n", |
1816 | verstep); | ||
1816 | } else if ((verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) { | 1817 | } else if ((verstep & 0xf0) == ADM1026_VERSTEP_GENERIC) { |
1817 | dev_err(&adapter->dev, "Found version/stepping " | 1818 | dev_err(&adapter->dev, |
1818 | "0x%02x. Assuming generic ADM1026.\n", | 1819 | "Found version/stepping 0x%02x. Assuming generic ADM1026.\n", |
1819 | verstep); | 1820 | verstep); |
1820 | } else { | 1821 | } else { |
1821 | dev_dbg(&adapter->dev, "Autodetection failed\n"); | 1822 | dev_dbg(&adapter->dev, "Autodetection failed\n"); |
diff --git a/drivers/hwmon/adm1029.c b/drivers/hwmon/adm1029.c index 97f4718382f6..9ee5e066423b 100644 --- a/drivers/hwmon/adm1029.c +++ b/drivers/hwmon/adm1029.c | |||
@@ -224,8 +224,9 @@ static ssize_t set_fan_div(struct device *dev, | |||
224 | break; | 224 | break; |
225 | default: | 225 | default: |
226 | mutex_unlock(&data->update_lock); | 226 | mutex_unlock(&data->update_lock); |
227 | dev_err(&client->dev, "fan_div value %ld not " | 227 | dev_err(&client->dev, |
228 | "supported. Choose one of 1, 2 or 4!\n", val); | 228 | "fan_div value %ld not supported. Choose one of 1, 2 or 4!\n", |
229 | val); | ||
229 | return -EINVAL; | 230 | return -EINVAL; |
230 | } | 231 | } |
231 | /* Update the value */ | 232 | /* Update the value */ |
@@ -326,8 +327,8 @@ static int adm1029_detect(struct i2c_client *client, | |||
326 | * There are no "official" CHIP ID, so actually | 327 | * There are no "official" CHIP ID, so actually |
327 | * we use Major/Minor revision for that | 328 | * we use Major/Minor revision for that |
328 | */ | 329 | */ |
329 | pr_info("adm1029: Unknown major revision %x, " | 330 | pr_info("Unknown major revision %x, please let us know\n", |
330 | "please let us know\n", chip_id); | 331 | chip_id); |
331 | return -ENODEV; | 332 | return -ENODEV; |
332 | } | 333 | } |
333 | 334 | ||
diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c index 2416628e0ab1..086d02a9ecdc 100644 --- a/drivers/hwmon/adm9240.c +++ b/drivers/hwmon/adm9240.c | |||
@@ -351,8 +351,9 @@ static void adm9240_write_fan_div(struct i2c_client *client, int nr, | |||
351 | reg &= ~(3 << shift); | 351 | reg &= ~(3 << shift); |
352 | reg |= (fan_div << shift); | 352 | reg |= (fan_div << shift); |
353 | i2c_smbus_write_byte_data(client, ADM9240_REG_VID_FAN_DIV, reg); | 353 | i2c_smbus_write_byte_data(client, ADM9240_REG_VID_FAN_DIV, reg); |
354 | dev_dbg(&client->dev, "fan%d clock divider changed from %u " | 354 | dev_dbg(&client->dev, |
355 | "to %u\n", nr + 1, 1 << old, 1 << fan_div); | 355 | "fan%d clock divider changed from %u to %u\n", |
356 | nr + 1, 1 << old, 1 << fan_div); | ||
356 | } | 357 | } |
357 | 358 | ||
358 | /* | 359 | /* |
@@ -699,8 +700,8 @@ static void adm9240_init_client(struct i2c_client *client) | |||
699 | /* start measurement cycle */ | 700 | /* start measurement cycle */ |
700 | i2c_smbus_write_byte_data(client, ADM9240_REG_CONFIG, 1); | 701 | i2c_smbus_write_byte_data(client, ADM9240_REG_CONFIG, 1); |
701 | 702 | ||
702 | dev_info(&client->dev, "cold start: config was 0x%02x " | 703 | dev_info(&client->dev, |
703 | "mode %u\n", conf, mode); | 704 | "cold start: config was 0x%02x mode %u\n", conf, mode); |
704 | } | 705 | } |
705 | } | 706 | } |
706 | 707 | ||
diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c index 34ff03abb50b..d9299dee37d1 100644 --- a/drivers/hwmon/adt7411.c +++ b/drivers/hwmon/adt7411.c | |||
@@ -259,15 +259,17 @@ static int adt7411_detect(struct i2c_client *client, | |||
259 | 259 | ||
260 | val = i2c_smbus_read_byte_data(client, ADT7411_REG_MANUFACTURER_ID); | 260 | val = i2c_smbus_read_byte_data(client, ADT7411_REG_MANUFACTURER_ID); |
261 | if (val < 0 || val != ADT7411_MANUFACTURER_ID) { | 261 | if (val < 0 || val != ADT7411_MANUFACTURER_ID) { |
262 | dev_dbg(&client->dev, "Wrong manufacturer ID. Got %d, " | 262 | dev_dbg(&client->dev, |
263 | "expected %d\n", val, ADT7411_MANUFACTURER_ID); | 263 | "Wrong manufacturer ID. Got %d, expected %d\n", |
264 | val, ADT7411_MANUFACTURER_ID); | ||
264 | return -ENODEV; | 265 | return -ENODEV; |
265 | } | 266 | } |
266 | 267 | ||
267 | val = i2c_smbus_read_byte_data(client, ADT7411_REG_DEVICE_ID); | 268 | val = i2c_smbus_read_byte_data(client, ADT7411_REG_DEVICE_ID); |
268 | if (val < 0 || val != ADT7411_DEVICE_ID) { | 269 | if (val < 0 || val != ADT7411_DEVICE_ID) { |
269 | dev_dbg(&client->dev, "Wrong device ID. Got %d, " | 270 | dev_dbg(&client->dev, |
270 | "expected %d\n", val, ADT7411_DEVICE_ID); | 271 | "Wrong device ID. Got %d, expected %d\n", |
272 | val, ADT7411_DEVICE_ID); | ||
271 | return -ENODEV; | 273 | return -ENODEV; |
272 | } | 274 | } |
273 | 275 | ||
diff --git a/drivers/hwmon/asb100.c b/drivers/hwmon/asb100.c index 6ac612cabda1..f96063680e58 100644 --- a/drivers/hwmon/asb100.c +++ b/drivers/hwmon/asb100.c | |||
@@ -55,8 +55,8 @@ static const unsigned short normal_i2c[] = { 0x2d, I2C_CLIENT_END }; | |||
55 | 55 | ||
56 | static unsigned short force_subclients[4]; | 56 | static unsigned short force_subclients[4]; |
57 | module_param_array(force_subclients, short, NULL, 0); | 57 | module_param_array(force_subclients, short, NULL, 0); |
58 | MODULE_PARM_DESC(force_subclients, "List of subclient addresses: " | 58 | MODULE_PARM_DESC(force_subclients, |
59 | "{bus, clientaddr, subclientaddr1, subclientaddr2}"); | 59 | "List of subclient addresses: {bus, clientaddr, subclientaddr1, subclientaddr2}"); |
60 | 60 | ||
61 | /* Voltage IN registers 0-6 */ | 61 | /* Voltage IN registers 0-6 */ |
62 | #define ASB100_REG_IN(nr) (0x20 + (nr)) | 62 | #define ASB100_REG_IN(nr) (0x20 + (nr)) |
@@ -689,8 +689,8 @@ static int asb100_detect_subclients(struct i2c_client *client) | |||
689 | for (i = 2; i <= 3; i++) { | 689 | for (i = 2; i <= 3; i++) { |
690 | if (force_subclients[i] < 0x48 || | 690 | if (force_subclients[i] < 0x48 || |
691 | force_subclients[i] > 0x4f) { | 691 | force_subclients[i] > 0x4f) { |
692 | dev_err(&client->dev, "invalid subclient " | 692 | dev_err(&client->dev, |
693 | "address %d; must be 0x48-0x4f\n", | 693 | "invalid subclient address %d; must be 0x48-0x4f\n", |
694 | force_subclients[i]); | 694 | force_subclients[i]); |
695 | err = -ENODEV; | 695 | err = -ENODEV; |
696 | goto ERROR_SC_2; | 696 | goto ERROR_SC_2; |
@@ -708,24 +708,27 @@ static int asb100_detect_subclients(struct i2c_client *client) | |||
708 | } | 708 | } |
709 | 709 | ||
710 | if (sc_addr[0] == sc_addr[1]) { | 710 | if (sc_addr[0] == sc_addr[1]) { |
711 | dev_err(&client->dev, "duplicate addresses 0x%x " | 711 | dev_err(&client->dev, |
712 | "for subclients\n", sc_addr[0]); | 712 | "duplicate addresses 0x%x for subclients\n", |
713 | sc_addr[0]); | ||
713 | err = -ENODEV; | 714 | err = -ENODEV; |
714 | goto ERROR_SC_2; | 715 | goto ERROR_SC_2; |
715 | } | 716 | } |
716 | 717 | ||
717 | data->lm75[0] = i2c_new_dummy(adapter, sc_addr[0]); | 718 | data->lm75[0] = i2c_new_dummy(adapter, sc_addr[0]); |
718 | if (!data->lm75[0]) { | 719 | if (!data->lm75[0]) { |
719 | dev_err(&client->dev, "subclient %d registration " | 720 | dev_err(&client->dev, |
720 | "at address 0x%x failed.\n", 1, sc_addr[0]); | 721 | "subclient %d registration at address 0x%x failed.\n", |
722 | 1, sc_addr[0]); | ||
721 | err = -ENOMEM; | 723 | err = -ENOMEM; |
722 | goto ERROR_SC_2; | 724 | goto ERROR_SC_2; |
723 | } | 725 | } |
724 | 726 | ||
725 | data->lm75[1] = i2c_new_dummy(adapter, sc_addr[1]); | 727 | data->lm75[1] = i2c_new_dummy(adapter, sc_addr[1]); |
726 | if (!data->lm75[1]) { | 728 | if (!data->lm75[1]) { |
727 | dev_err(&client->dev, "subclient %d registration " | 729 | dev_err(&client->dev, |
728 | "at address 0x%x failed.\n", 2, sc_addr[1]); | 730 | "subclient %d registration at address 0x%x failed.\n", |
731 | 2, sc_addr[1]); | ||
729 | err = -ENOMEM; | 732 | err = -ENOMEM; |
730 | goto ERROR_SC_3; | 733 | goto ERROR_SC_3; |
731 | } | 734 | } |
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index 3f1e297663ad..658ce3a8717f 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c | |||
@@ -411,8 +411,7 @@ static int __cpuinit chk_ucode_version(unsigned int cpu) | |||
411 | * fixed for stepping D0 (6EC). | 411 | * fixed for stepping D0 (6EC). |
412 | */ | 412 | */ |
413 | if (c->x86_model == 0xe && c->x86_mask < 0xc && c->microcode < 0x39) { | 413 | if (c->x86_model == 0xe && c->x86_mask < 0xc && c->microcode < 0x39) { |
414 | pr_err("Errata AE18 not fixed, update BIOS or " | 414 | pr_err("Errata AE18 not fixed, update BIOS or microcode of the CPU!\n"); |
415 | "microcode of the CPU!\n"); | ||
416 | return -ENODEV; | 415 | return -ENODEV; |
417 | } | 416 | } |
418 | return 0; | 417 | return 0; |
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c index c347c94f2f73..4ae3fff13f44 100644 --- a/drivers/hwmon/dme1737.c +++ b/drivers/hwmon/dme1737.c | |||
@@ -55,14 +55,16 @@ MODULE_PARM_DESC(force_id, "Override the detected device ID"); | |||
55 | 55 | ||
56 | static bool probe_all_addr; | 56 | static bool probe_all_addr; |
57 | module_param(probe_all_addr, bool, 0); | 57 | module_param(probe_all_addr, bool, 0); |
58 | MODULE_PARM_DESC(probe_all_addr, "Include probing of non-standard LPC " | 58 | MODULE_PARM_DESC(probe_all_addr, |
59 | "addresses"); | 59 | "Include probing of non-standard LPC addresses"); |
60 | 60 | ||
61 | /* Addresses to scan */ | 61 | /* Addresses to scan */ |
62 | static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END}; | 62 | static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END}; |
63 | 63 | ||
64 | enum chips { dme1737, sch5027, sch311x, sch5127 }; | 64 | enum chips { dme1737, sch5027, sch311x, sch5127 }; |
65 | 65 | ||
66 | #define DO_REPORT "Please report to the driver maintainer." | ||
67 | |||
66 | /* --------------------------------------------------------------------- | 68 | /* --------------------------------------------------------------------- |
67 | * Registers | 69 | * Registers |
68 | * | 70 | * |
@@ -566,9 +568,9 @@ static u8 dme1737_read(const struct dme1737_data *data, u8 reg) | |||
566 | val = i2c_smbus_read_byte_data(client, reg); | 568 | val = i2c_smbus_read_byte_data(client, reg); |
567 | 569 | ||
568 | if (val < 0) { | 570 | if (val < 0) { |
569 | dev_warn(&client->dev, "Read from register " | 571 | dev_warn(&client->dev, |
570 | "0x%02x failed! Please report to the driver " | 572 | "Read from register 0x%02x failed! %s\n", |
571 | "maintainer.\n", reg); | 573 | reg, DO_REPORT); |
572 | } | 574 | } |
573 | } else { /* ISA device */ | 575 | } else { /* ISA device */ |
574 | outb(reg, data->addr); | 576 | outb(reg, data->addr); |
@@ -587,9 +589,9 @@ static s32 dme1737_write(const struct dme1737_data *data, u8 reg, u8 val) | |||
587 | res = i2c_smbus_write_byte_data(client, reg, val); | 589 | res = i2c_smbus_write_byte_data(client, reg, val); |
588 | 590 | ||
589 | if (res < 0) { | 591 | if (res < 0) { |
590 | dev_warn(&client->dev, "Write to register " | 592 | dev_warn(&client->dev, |
591 | "0x%02x failed! Please report to the driver " | 593 | "Write to register 0x%02x failed! %s\n", |
592 | "maintainer.\n", reg); | 594 | reg, DO_REPORT); |
593 | } | 595 | } |
594 | } else { /* ISA device */ | 596 | } else { /* ISA device */ |
595 | outb(reg, data->addr); | 597 | outb(reg, data->addr); |
@@ -1167,8 +1169,8 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr, | |||
1167 | /* Only valid for fan[1-4] */ | 1169 | /* Only valid for fan[1-4] */ |
1168 | if (!(val == 1 || val == 2 || val == 4)) { | 1170 | if (!(val == 1 || val == 2 || val == 4)) { |
1169 | count = -EINVAL; | 1171 | count = -EINVAL; |
1170 | dev_warn(dev, "Fan type value %ld not " | 1172 | dev_warn(dev, |
1171 | "supported. Choose one of 1, 2, or 4.\n", | 1173 | "Fan type value %ld not supported. Choose one of 1, 2, or 4.\n", |
1172 | val); | 1174 | val); |
1173 | goto exit; | 1175 | goto exit; |
1174 | } | 1176 | } |
@@ -1294,8 +1296,8 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, | |||
1294 | /* Only valid for pwm[1-3] */ | 1296 | /* Only valid for pwm[1-3] */ |
1295 | if (val < 0 || val > 2) { | 1297 | if (val < 0 || val > 2) { |
1296 | count = -EINVAL; | 1298 | count = -EINVAL; |
1297 | dev_warn(dev, "PWM enable %ld not " | 1299 | dev_warn(dev, |
1298 | "supported. Choose one of 0, 1, or 2.\n", | 1300 | "PWM enable %ld not supported. Choose one of 0, 1, or 2.\n", |
1299 | val); | 1301 | val); |
1300 | goto exit; | 1302 | goto exit; |
1301 | } | 1303 | } |
@@ -1399,8 +1401,8 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, | |||
1399 | if (!(val == 1 || val == 2 || val == 4 || | 1401 | if (!(val == 1 || val == 2 || val == 4 || |
1400 | val == 6 || val == 7)) { | 1402 | val == 6 || val == 7)) { |
1401 | count = -EINVAL; | 1403 | count = -EINVAL; |
1402 | dev_warn(dev, "PWM auto channels zone %ld " | 1404 | dev_warn(dev, |
1403 | "not supported. Choose one of 1, 2, 4, 6, " | 1405 | "PWM auto channels zone %ld not supported. Choose one of 1, 2, 4, 6, " |
1404 | "or 7.\n", val); | 1406 | "or 7.\n", val); |
1405 | goto exit; | 1407 | goto exit; |
1406 | } | 1408 | } |
@@ -2178,8 +2180,8 @@ static int dme1737_create_files(struct device *dev) | |||
2178 | * selected attributes from read-only to read-writeable. | 2180 | * selected attributes from read-only to read-writeable. |
2179 | */ | 2181 | */ |
2180 | if (data->config & 0x02) { | 2182 | if (data->config & 0x02) { |
2181 | dev_info(dev, "Device is locked. Some attributes " | 2183 | dev_info(dev, |
2182 | "will be read-only.\n"); | 2184 | "Device is locked. Some attributes will be read-only.\n"); |
2183 | } else { | 2185 | } else { |
2184 | /* Change permissions of zone sysfs attributes */ | 2186 | /* Change permissions of zone sysfs attributes */ |
2185 | dme1737_chmod_group(dev, &dme1737_zone_chmod_group, | 2187 | dme1737_chmod_group(dev, &dme1737_zone_chmod_group, |
@@ -2247,9 +2249,8 @@ static int dme1737_init_device(struct device *dev) | |||
2247 | /* Inform if part is not monitoring/started */ | 2249 | /* Inform if part is not monitoring/started */ |
2248 | if (!(data->config & 0x01)) { | 2250 | if (!(data->config & 0x01)) { |
2249 | if (!force_start) { | 2251 | if (!force_start) { |
2250 | dev_err(dev, "Device is not monitoring. " | 2252 | dev_err(dev, |
2251 | "Use the force_start load parameter to " | 2253 | "Device is not monitoring. Use the force_start load parameter to override.\n"); |
2252 | "override.\n"); | ||
2253 | return -EFAULT; | 2254 | return -EFAULT; |
2254 | } | 2255 | } |
2255 | 2256 | ||
@@ -2289,8 +2290,8 @@ static int dme1737_init_device(struct device *dev) | |||
2289 | */ | 2290 | */ |
2290 | if (dme1737_i2c_get_features(0x2e, data) && | 2291 | if (dme1737_i2c_get_features(0x2e, data) && |
2291 | dme1737_i2c_get_features(0x4e, data)) { | 2292 | dme1737_i2c_get_features(0x4e, data)) { |
2292 | dev_warn(dev, "Failed to query Super-IO for optional " | 2293 | dev_warn(dev, |
2293 | "features.\n"); | 2294 | "Failed to query Super-IO for optional features.\n"); |
2294 | } | 2295 | } |
2295 | } | 2296 | } |
2296 | 2297 | ||
@@ -2317,8 +2318,8 @@ static int dme1737_init_device(struct device *dev) | |||
2317 | break; | 2318 | break; |
2318 | } | 2319 | } |
2319 | 2320 | ||
2320 | dev_info(dev, "Optional features: pwm3=%s, pwm5=%s, pwm6=%s, " | 2321 | dev_info(dev, |
2321 | "fan3=%s, fan4=%s, fan5=%s, fan6=%s.\n", | 2322 | "Optional features: pwm3=%s, pwm5=%s, pwm6=%s, fan3=%s, fan4=%s, fan5=%s, fan6=%s.\n", |
2322 | (data->has_features & HAS_PWM(2)) ? "yes" : "no", | 2323 | (data->has_features & HAS_PWM(2)) ? "yes" : "no", |
2323 | (data->has_features & HAS_PWM(4)) ? "yes" : "no", | 2324 | (data->has_features & HAS_PWM(4)) ? "yes" : "no", |
2324 | (data->has_features & HAS_PWM(5)) ? "yes" : "no", | 2325 | (data->has_features & HAS_PWM(5)) ? "yes" : "no", |
@@ -2330,18 +2331,16 @@ static int dme1737_init_device(struct device *dev) | |||
2330 | reg = dme1737_read(data, DME1737_REG_TACH_PWM); | 2331 | reg = dme1737_read(data, DME1737_REG_TACH_PWM); |
2331 | /* Inform if fan-to-pwm mapping differs from the default */ | 2332 | /* Inform if fan-to-pwm mapping differs from the default */ |
2332 | if (client && reg != 0xa4) { /* I2C chip */ | 2333 | if (client && reg != 0xa4) { /* I2C chip */ |
2333 | dev_warn(dev, "Non-standard fan to pwm mapping: " | 2334 | dev_warn(dev, |
2334 | "fan1->pwm%d, fan2->pwm%d, fan3->pwm%d, " | 2335 | "Non-standard fan to pwm mapping: fan1->pwm%d, fan2->pwm%d, fan3->pwm%d, fan4->pwm%d. %s\n", |
2335 | "fan4->pwm%d. Please report to the driver " | ||
2336 | "maintainer.\n", | ||
2337 | (reg & 0x03) + 1, ((reg >> 2) & 0x03) + 1, | 2336 | (reg & 0x03) + 1, ((reg >> 2) & 0x03) + 1, |
2338 | ((reg >> 4) & 0x03) + 1, ((reg >> 6) & 0x03) + 1); | 2337 | ((reg >> 4) & 0x03) + 1, ((reg >> 6) & 0x03) + 1, |
2338 | DO_REPORT); | ||
2339 | } else if (!client && reg != 0x24) { /* ISA chip */ | 2339 | } else if (!client && reg != 0x24) { /* ISA chip */ |
2340 | dev_warn(dev, "Non-standard fan to pwm mapping: " | 2340 | dev_warn(dev, |
2341 | "fan1->pwm%d, fan2->pwm%d, fan3->pwm%d. " | 2341 | "Non-standard fan to pwm mapping: fan1->pwm%d, fan2->pwm%d, fan3->pwm%d. %s\n", |
2342 | "Please report to the driver maintainer.\n", | ||
2343 | (reg & 0x03) + 1, ((reg >> 2) & 0x03) + 1, | 2342 | (reg & 0x03) + 1, ((reg >> 2) & 0x03) + 1, |
2344 | ((reg >> 4) & 0x03) + 1); | 2343 | ((reg >> 4) & 0x03) + 1, DO_REPORT); |
2345 | } | 2344 | } |
2346 | 2345 | ||
2347 | /* | 2346 | /* |
@@ -2355,8 +2354,9 @@ static int dme1737_init_device(struct device *dev) | |||
2355 | DME1737_REG_PWM_CONFIG(ix)); | 2354 | DME1737_REG_PWM_CONFIG(ix)); |
2356 | if ((data->has_features & HAS_PWM(ix)) && | 2355 | if ((data->has_features & HAS_PWM(ix)) && |
2357 | (PWM_EN_FROM_REG(data->pwm_config[ix]) == -1)) { | 2356 | (PWM_EN_FROM_REG(data->pwm_config[ix]) == -1)) { |
2358 | dev_info(dev, "Switching pwm%d to " | 2357 | dev_info(dev, |
2359 | "manual mode.\n", ix + 1); | 2358 | "Switching pwm%d to manual mode.\n", |
2359 | ix + 1); | ||
2360 | data->pwm_config[ix] = PWM_EN_TO_REG(1, | 2360 | data->pwm_config[ix] = PWM_EN_TO_REG(1, |
2361 | data->pwm_config[ix]); | 2361 | data->pwm_config[ix]); |
2362 | dme1737_write(data, DME1737_REG_PWM(ix), 0); | 2362 | dme1737_write(data, DME1737_REG_PWM(ix), 0); |
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index b757088aeddb..dff841085baf 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c | |||
@@ -189,8 +189,8 @@ static void fam15h_power_init_data(struct pci_dev *f4, | |||
189 | 189 | ||
190 | /* result not allowed to be >= 256W */ | 190 | /* result not allowed to be >= 256W */ |
191 | if ((tmp >> 16) >= 256) | 191 | if ((tmp >> 16) >= 256) |
192 | dev_warn(&f4->dev, "Bogus value for ProcessorPwrWatts " | 192 | dev_warn(&f4->dev, |
193 | "(processor_pwr_watts>=%u)\n", | 193 | "Bogus value for ProcessorPwrWatts (processor_pwr_watts>=%u)\n", |
194 | (unsigned int) (tmp >> 16)); | 194 | (unsigned int) (tmp >> 16)); |
195 | 195 | ||
196 | /* convert to microWatt */ | 196 | /* convert to microWatt */ |
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c index 8af2755cdb87..d58abdc5a4cf 100644 --- a/drivers/hwmon/fschmd.c +++ b/drivers/hwmon/fschmd.c | |||
@@ -463,8 +463,9 @@ static ssize_t store_fan_div(struct device *dev, struct device_attribute | |||
463 | v = 3; | 463 | v = 3; |
464 | break; | 464 | break; |
465 | default: | 465 | default: |
466 | dev_err(dev, "fan_div value %lu not supported. " | 466 | dev_err(dev, |
467 | "Choose one of 2, 4 or 8!\n", v); | 467 | "fan_div value %lu not supported. Choose one of 2, 4 or 8!\n", |
468 | v); | ||
468 | return -EINVAL; | 469 | return -EINVAL; |
469 | } | 470 | } |
470 | 471 | ||
@@ -1249,8 +1250,8 @@ static int fschmd_probe(struct i2c_client *client, | |||
1249 | } | 1250 | } |
1250 | if (i == ARRAY_SIZE(watchdog_minors)) { | 1251 | if (i == ARRAY_SIZE(watchdog_minors)) { |
1251 | data->watchdog_miscdev.minor = 0; | 1252 | data->watchdog_miscdev.minor = 0; |
1252 | dev_warn(&client->dev, "Couldn't register watchdog chardev " | 1253 | dev_warn(&client->dev, |
1253 | "(due to no free minor)\n"); | 1254 | "Couldn't register watchdog chardev (due to no free minor)\n"); |
1254 | } | 1255 | } |
1255 | mutex_unlock(&watchdog_data_mutex); | 1256 | mutex_unlock(&watchdog_data_mutex); |
1256 | 1257 | ||
diff --git a/drivers/hwmon/gl518sm.c b/drivers/hwmon/gl518sm.c index e2e5909a34df..95257a5621d8 100644 --- a/drivers/hwmon/gl518sm.c +++ b/drivers/hwmon/gl518sm.c | |||
@@ -344,8 +344,9 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, | |||
344 | val = 3; | 344 | val = 3; |
345 | break; | 345 | break; |
346 | default: | 346 | default: |
347 | dev_err(dev, "Invalid fan clock divider %lu, choose one " | 347 | dev_err(dev, |
348 | "of 1, 2, 4 or 8\n", val); | 348 | "Invalid fan clock divider %lu, choose one of 1, 2, 4 or 8\n", |
349 | val); | ||
349 | return -EINVAL; | 350 | return -EINVAL; |
350 | } | 351 | } |
351 | 352 | ||
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c index a14f634248e7..1429f6e177f4 100644 --- a/drivers/hwmon/ibmaem.c +++ b/drivers/hwmon/ibmaem.c | |||
@@ -289,8 +289,9 @@ static int aem_init_ipmi_data(struct aem_ipmi_data *data, int iface, | |||
289 | err = ipmi_create_user(data->interface, &driver_data.ipmi_hndlrs, | 289 | err = ipmi_create_user(data->interface, &driver_data.ipmi_hndlrs, |
290 | data, &data->user); | 290 | data, &data->user); |
291 | if (err < 0) { | 291 | if (err < 0) { |
292 | dev_err(bmc, "Unable to register user with IPMI " | 292 | dev_err(bmc, |
293 | "interface %d\n", data->interface); | 293 | "Unable to register user with IPMI interface %d\n", |
294 | data->interface); | ||
294 | return -EACCES; | 295 | return -EACCES; |
295 | } | 296 | } |
296 | 297 | ||
@@ -328,8 +329,8 @@ static void aem_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data) | |||
328 | struct aem_ipmi_data *data = user_msg_data; | 329 | struct aem_ipmi_data *data = user_msg_data; |
329 | 330 | ||
330 | if (msg->msgid != data->tx_msgid) { | 331 | if (msg->msgid != data->tx_msgid) { |
331 | dev_err(data->bmc_device, "Mismatch between received msgid " | 332 | dev_err(data->bmc_device, |
332 | "(%02x) and transmitted msgid (%02x)!\n", | 333 | "Mismatch between received msgid (%02x) and transmitted msgid (%02x)!\n", |
333 | (int)msg->msgid, | 334 | (int)msg->msgid, |
334 | (int)data->tx_msgid); | 335 | (int)data->tx_msgid); |
335 | ipmi_free_recv_msg(msg); | 336 | ipmi_free_recv_msg(msg); |
@@ -575,8 +576,8 @@ static int aem_init_aem1_inst(struct aem_ipmi_data *probe, u8 module_handle) | |||
575 | /* Register with hwmon */ | 576 | /* Register with hwmon */ |
576 | data->hwmon_dev = hwmon_device_register(&data->pdev->dev); | 577 | data->hwmon_dev = hwmon_device_register(&data->pdev->dev); |
577 | if (IS_ERR(data->hwmon_dev)) { | 578 | if (IS_ERR(data->hwmon_dev)) { |
578 | dev_err(&data->pdev->dev, "Unable to register hwmon " | 579 | dev_err(&data->pdev->dev, |
579 | "device for IPMI interface %d\n", | 580 | "Unable to register hwmon device for IPMI interface %d\n", |
580 | probe->interface); | 581 | probe->interface); |
581 | res = PTR_ERR(data->hwmon_dev); | 582 | res = PTR_ERR(data->hwmon_dev); |
582 | goto hwmon_reg_err; | 583 | goto hwmon_reg_err; |
@@ -715,8 +716,8 @@ static int aem_init_aem2_inst(struct aem_ipmi_data *probe, | |||
715 | /* Register with hwmon */ | 716 | /* Register with hwmon */ |
716 | data->hwmon_dev = hwmon_device_register(&data->pdev->dev); | 717 | data->hwmon_dev = hwmon_device_register(&data->pdev->dev); |
717 | if (IS_ERR(data->hwmon_dev)) { | 718 | if (IS_ERR(data->hwmon_dev)) { |
718 | dev_err(&data->pdev->dev, "Unable to register hwmon " | 719 | dev_err(&data->pdev->dev, |
719 | "device for IPMI interface %d\n", | 720 | "Unable to register hwmon device for IPMI interface %d\n", |
720 | probe->interface); | 721 | probe->interface); |
721 | res = PTR_ERR(data->hwmon_dev); | 722 | res = PTR_ERR(data->hwmon_dev); |
722 | goto hwmon_reg_err; | 723 | goto hwmon_reg_err; |
@@ -768,8 +769,8 @@ static void aem_init_aem2(struct aem_ipmi_data *probe) | |||
768 | 769 | ||
769 | while (!aem_find_aem2(probe, &fi_resp, i)) { | 770 | while (!aem_find_aem2(probe, &fi_resp, i)) { |
770 | if (fi_resp.major != 2) { | 771 | if (fi_resp.major != 2) { |
771 | dev_err(probe->bmc_device, "Unknown AEM v%d; please " | 772 | dev_err(probe->bmc_device, |
772 | "report this to the maintainer.\n", | 773 | "Unknown AEM v%d; please report this to the maintainer.\n", |
773 | fi_resp.major); | 774 | fi_resp.major); |
774 | i++; | 775 | i++; |
775 | continue; | 776 | continue; |
diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c index b622a93ec32c..74b365ea01c7 100644 --- a/drivers/hwmon/ibmpex.c +++ b/drivers/hwmon/ibmpex.c | |||
@@ -163,8 +163,8 @@ static int ibmpex_ver_check(struct ibmpex_bmc_data *data) | |||
163 | data->sensor_major = data->rx_msg_data[0]; | 163 | data->sensor_major = data->rx_msg_data[0]; |
164 | data->sensor_minor = data->rx_msg_data[1]; | 164 | data->sensor_minor = data->rx_msg_data[1]; |
165 | 165 | ||
166 | dev_info(data->bmc_device, "Found BMC with sensor interface " | 166 | dev_info(data->bmc_device, |
167 | "v%d.%d %d-%02d-%02d on interface %d\n", | 167 | "Found BMC with sensor interface v%d.%d %d-%02d-%02d on interface %d\n", |
168 | data->sensor_major, | 168 | data->sensor_major, |
169 | data->sensor_minor, | 169 | data->sensor_minor, |
170 | extract_value(data->rx_msg_data, 2), | 170 | extract_value(data->rx_msg_data, 2), |
@@ -478,8 +478,9 @@ static void ibmpex_register_bmc(int iface, struct device *dev) | |||
478 | err = ipmi_create_user(data->interface, &driver_data.ipmi_hndlrs, | 478 | err = ipmi_create_user(data->interface, &driver_data.ipmi_hndlrs, |
479 | data, &data->user); | 479 | data, &data->user); |
480 | if (err < 0) { | 480 | if (err < 0) { |
481 | dev_err(dev, "Unable to register user with IPMI " | 481 | dev_err(dev, |
482 | "interface %d\n", data->interface); | 482 | "Unable to register user with IPMI interface %d\n", |
483 | data->interface); | ||
483 | goto out; | 484 | goto out; |
484 | } | 485 | } |
485 | 486 | ||
@@ -501,8 +502,8 @@ static void ibmpex_register_bmc(int iface, struct device *dev) | |||
501 | data->hwmon_dev = hwmon_device_register(data->bmc_device); | 502 | data->hwmon_dev = hwmon_device_register(data->bmc_device); |
502 | 503 | ||
503 | if (IS_ERR(data->hwmon_dev)) { | 504 | if (IS_ERR(data->hwmon_dev)) { |
504 | dev_err(data->bmc_device, "Unable to register hwmon " | 505 | dev_err(data->bmc_device, |
505 | "device for IPMI interface %d\n", | 506 | "Unable to register hwmon device for IPMI interface %d\n", |
506 | data->interface); | 507 | data->interface); |
507 | goto out_user; | 508 | goto out_user; |
508 | } | 509 | } |
@@ -567,8 +568,8 @@ static void ibmpex_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data) | |||
567 | struct ibmpex_bmc_data *data = (struct ibmpex_bmc_data *)user_msg_data; | 568 | struct ibmpex_bmc_data *data = (struct ibmpex_bmc_data *)user_msg_data; |
568 | 569 | ||
569 | if (msg->msgid != data->tx_msgid) { | 570 | if (msg->msgid != data->tx_msgid) { |
570 | dev_err(data->bmc_device, "Mismatch between received msgid " | 571 | dev_err(data->bmc_device, |
571 | "(%02x) and transmitted msgid (%02x)!\n", | 572 | "Mismatch between received msgid (%02x) and transmitted msgid (%02x)!\n", |
572 | (int)msg->msgid, | 573 | (int)msg->msgid, |
573 | (int)data->tx_msgid); | 574 | (int)data->tx_msgid); |
574 | ipmi_free_recv_msg(msg); | 575 | ipmi_free_recv_msg(msg); |
diff --git a/drivers/hwmon/k8temp.c b/drivers/hwmon/k8temp.c index 9f3c0aeacdb9..5b50e9e4f96b 100644 --- a/drivers/hwmon/k8temp.c +++ b/drivers/hwmon/k8temp.c | |||
@@ -200,8 +200,8 @@ static int k8temp_probe(struct pci_dev *pdev, | |||
200 | */ | 200 | */ |
201 | if (model >= 0x40) { | 201 | if (model >= 0x40) { |
202 | data->swap_core_select = 1; | 202 | data->swap_core_select = 1; |
203 | dev_warn(&pdev->dev, "Temperature readouts might be wrong - " | 203 | dev_warn(&pdev->dev, |
204 | "check erratum #141\n"); | 204 | "Temperature readouts might be wrong - check erratum #141\n"); |
205 | } | 205 | } |
206 | 206 | ||
207 | /* | 207 | /* |
diff --git a/drivers/hwmon/lm78.c b/drivers/hwmon/lm78.c index 483538fa1bd5..6cf6bff79003 100644 --- a/drivers/hwmon/lm78.c +++ b/drivers/hwmon/lm78.c | |||
@@ -386,8 +386,9 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *da, | |||
386 | data->fan_div[nr] = 3; | 386 | data->fan_div[nr] = 3; |
387 | break; | 387 | break; |
388 | default: | 388 | default: |
389 | dev_err(dev, "fan_div value %ld not " | 389 | dev_err(dev, |
390 | "supported. Choose one of 1, 2, 4 or 8!\n", val); | 390 | "fan_div value %ld not supported. Choose one of 1, 2, 4 or 8!\n", |
391 | val); | ||
391 | mutex_unlock(&data->update_lock); | 392 | mutex_unlock(&data->update_lock); |
392 | return -EINVAL; | 393 | return -EINVAL; |
393 | } | 394 | } |
@@ -636,8 +637,9 @@ static int lm78_i2c_detect(struct i2c_client *client, | |||
636 | goto err_nodev; | 637 | goto err_nodev; |
637 | 638 | ||
638 | if (lm78_alias_detect(client, i)) { | 639 | if (lm78_alias_detect(client, i)) { |
639 | dev_dbg(&adapter->dev, "Device at 0x%02x appears to " | 640 | dev_dbg(&adapter->dev, |
640 | "be the same as ISA device\n", address); | 641 | "Device at 0x%02x appears to be the same as ISA device\n", |
642 | address); | ||
641 | goto err_nodev; | 643 | goto err_nodev; |
642 | } | 644 | } |
643 | 645 | ||
diff --git a/drivers/hwmon/lm80.c b/drivers/hwmon/lm80.c index 357fbb998728..eba89aac3ece 100644 --- a/drivers/hwmon/lm80.c +++ b/drivers/hwmon/lm80.c | |||
@@ -286,8 +286,9 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, | |||
286 | data->fan_div[nr] = 3; | 286 | data->fan_div[nr] = 3; |
287 | break; | 287 | break; |
288 | default: | 288 | default: |
289 | dev_err(&client->dev, "fan_div value %ld not " | 289 | dev_err(&client->dev, |
290 | "supported. Choose one of 1, 2, 4 or 8!\n", val); | 290 | "fan_div value %ld not supported. Choose one of 1, 2, 4 or 8!\n", |
291 | val); | ||
291 | mutex_unlock(&data->update_lock); | 292 | mutex_unlock(&data->update_lock); |
292 | return -EINVAL; | 293 | return -EINVAL; |
293 | } | 294 | } |
diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c index 47ade8ba152d..3894c408fda3 100644 --- a/drivers/hwmon/lm85.c +++ b/drivers/hwmon/lm85.c | |||
@@ -1293,8 +1293,8 @@ static int lm85_detect(struct i2c_client *client, struct i2c_board_info *info) | |||
1293 | company = lm85_read_value(client, LM85_REG_COMPANY); | 1293 | company = lm85_read_value(client, LM85_REG_COMPANY); |
1294 | verstep = lm85_read_value(client, LM85_REG_VERSTEP); | 1294 | verstep = lm85_read_value(client, LM85_REG_VERSTEP); |
1295 | 1295 | ||
1296 | dev_dbg(&adapter->dev, "Detecting device at 0x%02x with " | 1296 | dev_dbg(&adapter->dev, |
1297 | "COMPANY: 0x%02x and VERSTEP: 0x%02x\n", | 1297 | "Detecting device at 0x%02x with COMPANY: 0x%02x and VERSTEP: 0x%02x\n", |
1298 | address, company, verstep); | 1298 | address, company, verstep); |
1299 | 1299 | ||
1300 | /* All supported chips have the version in common */ | 1300 | /* All supported chips have the version in common */ |
diff --git a/drivers/hwmon/lm93.c b/drivers/hwmon/lm93.c index 340382f173a0..a6f46058b1be 100644 --- a/drivers/hwmon/lm93.c +++ b/drivers/hwmon/lm93.c | |||
@@ -818,8 +818,9 @@ static u8 lm93_read_byte(struct i2c_client *client, u8 reg) | |||
818 | if (value >= 0) { | 818 | if (value >= 0) { |
819 | return value; | 819 | return value; |
820 | } else { | 820 | } else { |
821 | dev_warn(&client->dev, "lm93: read byte data failed, " | 821 | dev_warn(&client->dev, |
822 | "address 0x%02x.\n", reg); | 822 | "lm93: read byte data failed, address 0x%02x.\n", |
823 | reg); | ||
823 | mdelay(i + 3); | 824 | mdelay(i + 3); |
824 | } | 825 | } |
825 | 826 | ||
@@ -838,8 +839,9 @@ static int lm93_write_byte(struct i2c_client *client, u8 reg, u8 value) | |||
838 | result = i2c_smbus_write_byte_data(client, reg, value); | 839 | result = i2c_smbus_write_byte_data(client, reg, value); |
839 | 840 | ||
840 | if (result < 0) | 841 | if (result < 0) |
841 | dev_warn(&client->dev, "lm93: write byte data failed, " | 842 | dev_warn(&client->dev, |
842 | "0x%02x at address 0x%02x.\n", value, reg); | 843 | "lm93: write byte data failed, 0x%02x at address 0x%02x.\n", |
844 | value, reg); | ||
843 | 845 | ||
844 | return result; | 846 | return result; |
845 | } | 847 | } |
@@ -854,8 +856,9 @@ static u16 lm93_read_word(struct i2c_client *client, u8 reg) | |||
854 | if (value >= 0) { | 856 | if (value >= 0) { |
855 | return value; | 857 | return value; |
856 | } else { | 858 | } else { |
857 | dev_warn(&client->dev, "lm93: read word data failed, " | 859 | dev_warn(&client->dev, |
858 | "address 0x%02x.\n", reg); | 860 | "lm93: read word data failed, address 0x%02x.\n", |
861 | reg); | ||
859 | mdelay(i + 3); | 862 | mdelay(i + 3); |
860 | } | 863 | } |
861 | 864 | ||
@@ -874,8 +877,9 @@ static int lm93_write_word(struct i2c_client *client, u8 reg, u16 value) | |||
874 | result = i2c_smbus_write_word_data(client, reg, value); | 877 | result = i2c_smbus_write_word_data(client, reg, value); |
875 | 878 | ||
876 | if (result < 0) | 879 | if (result < 0) |
877 | dev_warn(&client->dev, "lm93: write word data failed, " | 880 | dev_warn(&client->dev, |
878 | "0x%04x at address 0x%02x.\n", value, reg); | 881 | "lm93: write word data failed, 0x%04x at address 0x%02x.\n", |
882 | value, reg); | ||
879 | 883 | ||
880 | return result; | 884 | return result; |
881 | } | 885 | } |
@@ -898,8 +902,8 @@ static void lm93_read_block(struct i2c_client *client, u8 fbn, u8 *values) | |||
898 | if (result == lm93_block_read_cmds[fbn].len) { | 902 | if (result == lm93_block_read_cmds[fbn].len) { |
899 | break; | 903 | break; |
900 | } else { | 904 | } else { |
901 | dev_warn(&client->dev, "lm93: block read data failed, " | 905 | dev_warn(&client->dev, |
902 | "command 0x%02x.\n", | 906 | "lm93: block read data failed, command 0x%02x.\n", |
903 | lm93_block_read_cmds[fbn].cmd); | 907 | lm93_block_read_cmds[fbn].cmd); |
904 | mdelay(i + 3); | 908 | mdelay(i + 3); |
905 | } | 909 | } |
@@ -2672,8 +2676,8 @@ static void lm93_init_client(struct i2c_client *client) | |||
2672 | return; | 2676 | return; |
2673 | } | 2677 | } |
2674 | 2678 | ||
2675 | dev_warn(&client->dev, "timed out waiting for sensor " | 2679 | dev_warn(&client->dev, |
2676 | "chip to signal ready!\n"); | 2680 | "timed out waiting for sensor chip to signal ready!\n"); |
2677 | } | 2681 | } |
2678 | 2682 | ||
2679 | /* Return 0 if detection is successful, -ENODEV otherwise */ | 2683 | /* Return 0 if detection is successful, -ENODEV otherwise */ |
@@ -2733,12 +2737,12 @@ static int lm93_probe(struct i2c_client *client, | |||
2733 | dev_dbg(&client->dev, "using SMBus block data transactions\n"); | 2737 | dev_dbg(&client->dev, "using SMBus block data transactions\n"); |
2734 | update = lm93_update_client_full; | 2738 | update = lm93_update_client_full; |
2735 | } else if ((LM93_SMBUS_FUNC_MIN & func) == LM93_SMBUS_FUNC_MIN) { | 2739 | } else if ((LM93_SMBUS_FUNC_MIN & func) == LM93_SMBUS_FUNC_MIN) { |
2736 | dev_dbg(&client->dev, "disabled SMBus block data " | 2740 | dev_dbg(&client->dev, |
2737 | "transactions\n"); | 2741 | "disabled SMBus block data transactions\n"); |
2738 | update = lm93_update_client_min; | 2742 | update = lm93_update_client_min; |
2739 | } else { | 2743 | } else { |
2740 | dev_dbg(&client->dev, "detect failed, " | 2744 | dev_dbg(&client->dev, |
2741 | "smbus byte and/or word data not supported!\n"); | 2745 | "detect failed, smbus byte and/or word data not supported!\n"); |
2742 | return -ENODEV; | 2746 | return -ENODEV; |
2743 | } | 2747 | } |
2744 | 2748 | ||
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c index e35856bb79b4..aa615ba73d4b 100644 --- a/drivers/hwmon/pc87360.c +++ b/drivers/hwmon/pc87360.c | |||
@@ -1190,8 +1190,7 @@ static int __init pc87360_find(int sioaddr, u8 *devid, | |||
1190 | confreg[3] = superio_inb(sioaddr, 0x25); | 1190 | confreg[3] = superio_inb(sioaddr, 0x25); |
1191 | 1191 | ||
1192 | if (confreg[2] & 0x40) { | 1192 | if (confreg[2] & 0x40) { |
1193 | pr_info("Using thermistors for " | 1193 | pr_info("Using thermistors for temperature monitoring\n"); |
1194 | "temperature monitoring\n"); | ||
1195 | } | 1194 | } |
1196 | if (confreg[3] & 0xE0) { | 1195 | if (confreg[3] & 0xE0) { |
1197 | pr_info("VID inputs routed (mode %u)\n", | 1196 | pr_info("VID inputs routed (mode %u)\n", |
@@ -1271,9 +1270,9 @@ static int pc87360_probe(struct platform_device *pdev) | |||
1271 | if (data->address[i] | 1270 | if (data->address[i] |
1272 | && !devm_request_region(dev, extra_isa[i], PC87360_EXTENT, | 1271 | && !devm_request_region(dev, extra_isa[i], PC87360_EXTENT, |
1273 | pc87360_driver.driver.name)) { | 1272 | pc87360_driver.driver.name)) { |
1274 | dev_err(dev, "Region 0x%x-0x%x already " | 1273 | dev_err(dev, |
1275 | "in use!\n", extra_isa[i], | 1274 | "Region 0x%x-0x%x already in use!\n", |
1276 | extra_isa[i]+PC87360_EXTENT-1); | 1275 | extra_isa[i], extra_isa[i]+PC87360_EXTENT-1); |
1277 | return -EBUSY; | 1276 | return -EBUSY; |
1278 | } | 1277 | } |
1279 | } | 1278 | } |
@@ -1435,8 +1434,8 @@ static void pc87360_init_device(struct platform_device *pdev, | |||
1435 | if (init >= 2 && data->innr) { | 1434 | if (init >= 2 && data->innr) { |
1436 | reg = pc87360_read_value(data, LD_IN, NO_BANK, | 1435 | reg = pc87360_read_value(data, LD_IN, NO_BANK, |
1437 | PC87365_REG_IN_CONVRATE); | 1436 | PC87365_REG_IN_CONVRATE); |
1438 | dev_info(&pdev->dev, "VLM conversion set to " | 1437 | dev_info(&pdev->dev, |
1439 | "1s period, 160us delay\n"); | 1438 | "VLM conversion set to 1s period, 160us delay\n"); |
1440 | pc87360_write_value(data, LD_IN, NO_BANK, | 1439 | pc87360_write_value(data, LD_IN, NO_BANK, |
1441 | PC87365_REG_IN_CONVRATE, | 1440 | PC87365_REG_IN_CONVRATE, |
1442 | (reg & 0xC0) | 0x11); | 1441 | (reg & 0xC0) | 0x11); |
@@ -1450,8 +1449,8 @@ static void pc87360_init_device(struct platform_device *pdev, | |||
1450 | if (init >= init_in[i]) { | 1449 | if (init >= init_in[i]) { |
1451 | /* Forcibly enable voltage channel */ | 1450 | /* Forcibly enable voltage channel */ |
1452 | if (!(reg & CHAN_ENA)) { | 1451 | if (!(reg & CHAN_ENA)) { |
1453 | dev_dbg(&pdev->dev, "Forcibly " | 1452 | dev_dbg(&pdev->dev, "Forcibly enabling in%d\n", |
1454 | "enabling in%d\n", i); | 1453 | i); |
1455 | pc87360_write_value(data, LD_IN, i, | 1454 | pc87360_write_value(data, LD_IN, i, |
1456 | PC87365_REG_IN_STATUS, | 1455 | PC87365_REG_IN_STATUS, |
1457 | (reg & 0x68) | 0x87); | 1456 | (reg & 0x68) | 0x87); |
@@ -1575,8 +1574,8 @@ static void pc87360_autodiv(struct device *dev, int nr) | |||
1575 | data->fan_status[nr] += 0x20; | 1574 | data->fan_status[nr] += 0x20; |
1576 | data->fan_min[nr] >>= 1; | 1575 | data->fan_min[nr] >>= 1; |
1577 | data->fan[nr] >>= 1; | 1576 | data->fan[nr] >>= 1; |
1578 | dev_dbg(dev, "Increasing " | 1577 | dev_dbg(dev, |
1579 | "clock divider to %d for fan %d\n", | 1578 | "Increasing clock divider to %d for fan %d\n", |
1580 | FAN_DIV_FROM_REG(data->fan_status[nr]), nr + 1); | 1579 | FAN_DIV_FROM_REG(data->fan_status[nr]), nr + 1); |
1581 | } | 1580 | } |
1582 | } else { | 1581 | } else { |
@@ -1587,8 +1586,8 @@ static void pc87360_autodiv(struct device *dev, int nr) | |||
1587 | data->fan_status[nr] -= 0x20; | 1586 | data->fan_status[nr] -= 0x20; |
1588 | data->fan_min[nr] <<= 1; | 1587 | data->fan_min[nr] <<= 1; |
1589 | data->fan[nr] <<= 1; | 1588 | data->fan[nr] <<= 1; |
1590 | dev_dbg(dev, "Decreasing " | 1589 | dev_dbg(dev, |
1591 | "clock divider to %d for fan %d\n", | 1590 | "Decreasing clock divider to %d for fan %d\n", |
1592 | FAN_DIV_FROM_REG(data->fan_status[nr]), | 1591 | FAN_DIV_FROM_REG(data->fan_status[nr]), |
1593 | nr + 1); | 1592 | nr + 1); |
1594 | } | 1593 | } |
diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c index 6086ad039d7d..ea606860d2b2 100644 --- a/drivers/hwmon/pc87427.c +++ b/drivers/hwmon/pc87427.c | |||
@@ -627,8 +627,9 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute | |||
627 | pc87427_readall_pwm(data, nr); | 627 | pc87427_readall_pwm(data, nr); |
628 | mode = data->pwm_enable[nr] & PWM_ENABLE_MODE_MASK; | 628 | mode = data->pwm_enable[nr] & PWM_ENABLE_MODE_MASK; |
629 | if (mode != PWM_MODE_MANUAL && mode != PWM_MODE_OFF) { | 629 | if (mode != PWM_MODE_MANUAL && mode != PWM_MODE_OFF) { |
630 | dev_notice(dev, "Can't set PWM%d duty cycle while not in " | 630 | dev_notice(dev, |
631 | "manual mode\n", nr + 1); | 631 | "Can't set PWM%d duty cycle while not in manual mode\n", |
632 | nr + 1); | ||
632 | mutex_unlock(&data->lock); | 633 | mutex_unlock(&data->lock); |
633 | return -EPERM; | 634 | return -EPERM; |
634 | } | 635 | } |
@@ -1245,16 +1246,16 @@ static int __init pc87427_find(int sioaddr, struct pc87427_sio_data *sio_data) | |||
1245 | 1246 | ||
1246 | val = superio_inb(sioaddr, SIOREG_MAP); | 1247 | val = superio_inb(sioaddr, SIOREG_MAP); |
1247 | if (val & 0x01) { | 1248 | if (val & 0x01) { |
1248 | pr_warn("Logical device 0x%02x is memory-mapped, " | 1249 | pr_warn("Logical device 0x%02x is memory-mapped, can't use\n", |
1249 | "can't use\n", logdev[i]); | 1250 | logdev[i]); |
1250 | continue; | 1251 | continue; |
1251 | } | 1252 | } |
1252 | 1253 | ||
1253 | val = (superio_inb(sioaddr, SIOREG_IOBASE) << 8) | 1254 | val = (superio_inb(sioaddr, SIOREG_IOBASE) << 8) |
1254 | | superio_inb(sioaddr, SIOREG_IOBASE + 1); | 1255 | | superio_inb(sioaddr, SIOREG_IOBASE + 1); |
1255 | if (!val) { | 1256 | if (!val) { |
1256 | pr_info("I/O base address not set for logical device " | 1257 | pr_info("I/O base address not set for logical device 0x%02x\n", |
1257 | "0x%02x\n", logdev[i]); | 1258 | logdev[i]); |
1258 | continue; | 1259 | continue; |
1259 | } | 1260 | } |
1260 | sio_data->address[i] = val; | 1261 | sio_data->address[i] = val; |
diff --git a/drivers/hwmon/sch56xx-common.c b/drivers/hwmon/sch56xx-common.c index d00b30adc34b..738681983284 100644 --- a/drivers/hwmon/sch56xx-common.c +++ b/drivers/hwmon/sch56xx-common.c | |||
@@ -161,8 +161,8 @@ static int sch56xx_send_cmd(u16 addr, u8 cmd, u16 reg, u8 v) | |||
161 | break; | 161 | break; |
162 | } | 162 | } |
163 | if (i == max_busy_polls + max_lazy_polls) { | 163 | if (i == max_busy_polls + max_lazy_polls) { |
164 | pr_err("Max retries exceeded reading virtual " | 164 | pr_err("Max retries exceeded reading virtual register 0x%04hx (%d)\n", |
165 | "register 0x%04hx (%d)\n", reg, 1); | 165 | reg, 1); |
166 | return -EIO; | 166 | return -EIO; |
167 | } | 167 | } |
168 | 168 | ||
@@ -178,12 +178,12 @@ static int sch56xx_send_cmd(u16 addr, u8 cmd, u16 reg, u8 v) | |||
178 | break; | 178 | break; |
179 | 179 | ||
180 | if (i == 0) | 180 | if (i == 0) |
181 | pr_warn("EC reports: 0x%02x reading virtual register " | 181 | pr_warn("EC reports: 0x%02x reading virtual register 0x%04hx\n", |
182 | "0x%04hx\n", (unsigned int)val, reg); | 182 | (unsigned int)val, reg); |
183 | } | 183 | } |
184 | if (i == max_busy_polls) { | 184 | if (i == max_busy_polls) { |
185 | pr_err("Max retries exceeded reading virtual " | 185 | pr_err("Max retries exceeded reading virtual register 0x%04hx (%d)\n", |
186 | "register 0x%04hx (%d)\n", reg, 2); | 186 | reg, 2); |
187 | return -EIO; | 187 | return -EIO; |
188 | } | 188 | } |
189 | 189 | ||
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c index c35847a1a0a3..1404e6319deb 100644 --- a/drivers/hwmon/sis5595.c +++ b/drivers/hwmon/sis5595.c | |||
@@ -456,8 +456,9 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *da, | |||
456 | data->fan_div[nr] = 3; | 456 | data->fan_div[nr] = 3; |
457 | break; | 457 | break; |
458 | default: | 458 | default: |
459 | dev_err(dev, "fan_div value %ld not " | 459 | dev_err(dev, |
460 | "supported. Choose one of 1, 2, 4 or 8!\n", val); | 460 | "fan_div value %ld not supported. Choose one of 1, 2, 4 or 8!\n", |
461 | val); | ||
461 | mutex_unlock(&data->update_lock); | 462 | mutex_unlock(&data->update_lock); |
462 | return -EINVAL; | 463 | return -EINVAL; |
463 | } | 464 | } |
diff --git a/drivers/hwmon/thmc50.c b/drivers/hwmon/thmc50.c index 4b59eb53b18a..db288db7d3e9 100644 --- a/drivers/hwmon/thmc50.c +++ b/drivers/hwmon/thmc50.c | |||
@@ -41,8 +41,8 @@ enum chips { thmc50, adm1022 }; | |||
41 | static unsigned short adm1022_temp3[16]; | 41 | static unsigned short adm1022_temp3[16]; |
42 | static unsigned int adm1022_temp3_num; | 42 | static unsigned int adm1022_temp3_num; |
43 | module_param_array(adm1022_temp3, ushort, &adm1022_temp3_num, 0); | 43 | module_param_array(adm1022_temp3, ushort, &adm1022_temp3_num, 0); |
44 | MODULE_PARM_DESC(adm1022_temp3, "List of adapter,address pairs " | 44 | MODULE_PARM_DESC(adm1022_temp3, |
45 | "to enable 3rd temperature (ADM1022 only)"); | 45 | "List of adapter,address pairs to enable 3rd temperature (ADM1022 only)"); |
46 | 46 | ||
47 | /* Many THMC50 constants specified below */ | 47 | /* Many THMC50 constants specified below */ |
48 | 48 | ||
@@ -312,8 +312,7 @@ static int thmc50_detect(struct i2c_client *client, | |||
312 | const char *type_name; | 312 | const char *type_name; |
313 | 313 | ||
314 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { | 314 | if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { |
315 | pr_debug("thmc50: detect failed, " | 315 | pr_debug("thmc50: detect failed, smbus byte data not supported!\n"); |
316 | "smbus byte data not supported!\n"); | ||
317 | return -ENODEV; | 316 | return -ENODEV; |
318 | } | 317 | } |
319 | 318 | ||
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index 523dd89ba498..d7b47abf37fe 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c | |||
@@ -155,8 +155,8 @@ static int tmp102_probe(struct i2c_client *client, | |||
155 | 155 | ||
156 | if (!i2c_check_functionality(client->adapter, | 156 | if (!i2c_check_functionality(client->adapter, |
157 | I2C_FUNC_SMBUS_WORD_DATA)) { | 157 | I2C_FUNC_SMBUS_WORD_DATA)) { |
158 | dev_err(&client->dev, "adapter doesn't support SMBus word " | 158 | dev_err(&client->dev, |
159 | "transactions\n"); | 159 | "adapter doesn't support SMBus word transactions\n"); |
160 | return -ENODEV; | 160 | return -ENODEV; |
161 | } | 161 | } |
162 | 162 | ||
diff --git a/drivers/hwmon/tmp401.c b/drivers/hwmon/tmp401.c index c85f6967ccc3..97bf34494d84 100644 --- a/drivers/hwmon/tmp401.c +++ b/drivers/hwmon/tmp401.c | |||
@@ -451,8 +451,9 @@ static ssize_t reset_temp_history(struct device *dev, | |||
451 | return -EINVAL; | 451 | return -EINVAL; |
452 | 452 | ||
453 | if (val != 1) { | 453 | if (val != 1) { |
454 | dev_err(dev, "temp_reset_history value %ld not" | 454 | dev_err(dev, |
455 | " supported. Use 1 to reset the history!\n", val); | 455 | "temp_reset_history value %ld not supported. Use 1 to reset the history!\n", |
456 | val); | ||
456 | return -EINVAL; | 457 | return -EINVAL; |
457 | } | 458 | } |
458 | i2c_smbus_write_byte_data(to_i2c_client(dev), | 459 | i2c_smbus_write_byte_data(to_i2c_client(dev), |
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c index 6a8ded29f1ed..964c1d688274 100644 --- a/drivers/hwmon/tmp421.c +++ b/drivers/hwmon/tmp421.c | |||
@@ -208,8 +208,8 @@ static int tmp421_init_client(struct i2c_client *client) | |||
208 | /* Start conversions (disable shutdown if necessary) */ | 208 | /* Start conversions (disable shutdown if necessary) */ |
209 | config = i2c_smbus_read_byte_data(client, TMP421_CONFIG_REG_1); | 209 | config = i2c_smbus_read_byte_data(client, TMP421_CONFIG_REG_1); |
210 | if (config < 0) { | 210 | if (config < 0) { |
211 | dev_err(&client->dev, "Could not read configuration" | 211 | dev_err(&client->dev, |
212 | " register (%d)\n", config); | 212 | "Could not read configuration register (%d)\n", config); |
213 | return -ENODEV; | 213 | return -ENODEV; |
214 | } | 214 | } |
215 | 215 | ||
@@ -322,6 +322,5 @@ static struct i2c_driver tmp421_driver = { | |||
322 | module_i2c_driver(tmp421_driver); | 322 | module_i2c_driver(tmp421_driver); |
323 | 323 | ||
324 | MODULE_AUTHOR("Andre Prendel <andre.prendel@gmx.de>"); | 324 | MODULE_AUTHOR("Andre Prendel <andre.prendel@gmx.de>"); |
325 | MODULE_DESCRIPTION("Texas Instruments TMP421/422/423 temperature sensor" | 325 | MODULE_DESCRIPTION("Texas Instruments TMP421/422/423 temperature sensor driver"); |
326 | " driver"); | ||
327 | MODULE_LICENSE("GPL"); | 326 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c index 9427e95f7903..c9dcce8c3dc3 100644 --- a/drivers/hwmon/via686a.c +++ b/drivers/hwmon/via686a.c | |||
@@ -889,8 +889,8 @@ static int via686a_pci_probe(struct pci_dev *dev, | |||
889 | 889 | ||
890 | address = val & ~(VIA686A_EXTENT - 1); | 890 | address = val & ~(VIA686A_EXTENT - 1); |
891 | if (address == 0) { | 891 | if (address == 0) { |
892 | dev_err(&dev->dev, "base address not set - upgrade BIOS " | 892 | dev_err(&dev->dev, |
893 | "or use force_addr=0xaddr\n"); | 893 | "base address not set - upgrade BIOS or use force_addr=0xaddr\n"); |
894 | return -ENODEV; | 894 | return -ENODEV; |
895 | } | 895 | } |
896 | 896 | ||
@@ -899,8 +899,9 @@ static int via686a_pci_probe(struct pci_dev *dev, | |||
899 | return -ENODEV; | 899 | return -ENODEV; |
900 | if (!(val & 0x0001)) { | 900 | if (!(val & 0x0001)) { |
901 | if (!force_addr) { | 901 | if (!force_addr) { |
902 | dev_warn(&dev->dev, "Sensors disabled, enable " | 902 | dev_warn(&dev->dev, |
903 | "with force_addr=0x%x\n", address); | 903 | "Sensors disabled, enable with force_addr=0x%x\n", |
904 | address); | ||
904 | return -ENODEV; | 905 | return -ENODEV; |
905 | } | 906 | } |
906 | 907 | ||
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c index dcc62f80f67b..6b2f1a42b3ff 100644 --- a/drivers/hwmon/vt1211.c +++ b/drivers/hwmon/vt1211.c | |||
@@ -571,8 +571,9 @@ static ssize_t set_fan(struct device *dev, struct device_attribute *attr, | |||
571 | break; | 571 | break; |
572 | default: | 572 | default: |
573 | count = -EINVAL; | 573 | count = -EINVAL; |
574 | dev_warn(dev, "fan div value %ld not supported. " | 574 | dev_warn(dev, |
575 | "Choose one of 1, 2, 4, or 8.\n", val); | 575 | "fan div value %ld not supported. Choose one of 1, 2, 4, or 8.\n", |
576 | val); | ||
576 | goto EXIT; | 577 | goto EXIT; |
577 | } | 578 | } |
578 | vt1211_write8(data, VT1211_REG_FAN_DIV, | 579 | vt1211_write8(data, VT1211_REG_FAN_DIV, |
@@ -674,8 +675,9 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, | |||
674 | break; | 675 | break; |
675 | default: | 676 | default: |
676 | count = -EINVAL; | 677 | count = -EINVAL; |
677 | dev_warn(dev, "pwm mode %ld not supported. " | 678 | dev_warn(dev, |
678 | "Choose one of 0 or 2.\n", val); | 679 | "pwm mode %ld not supported. Choose one of 0 or 2.\n", |
680 | val); | ||
679 | goto EXIT; | 681 | goto EXIT; |
680 | } | 682 | } |
681 | vt1211_write8(data, VT1211_REG_PWM_CTL, | 683 | vt1211_write8(data, VT1211_REG_PWM_CTL, |
@@ -700,8 +702,9 @@ static ssize_t set_pwm(struct device *dev, struct device_attribute *attr, | |||
700 | case SHOW_SET_PWM_AUTO_CHANNELS_TEMP: | 702 | case SHOW_SET_PWM_AUTO_CHANNELS_TEMP: |
701 | if (val < 1 || val > 7) { | 703 | if (val < 1 || val > 7) { |
702 | count = -EINVAL; | 704 | count = -EINVAL; |
703 | dev_warn(dev, "temp channel %ld not supported. " | 705 | dev_warn(dev, |
704 | "Choose a value between 1 and 7.\n", val); | 706 | "temp channel %ld not supported. Choose a value between 1 and 7.\n", |
707 | val); | ||
705 | goto EXIT; | 708 | goto EXIT; |
706 | } | 709 | } |
707 | if (!ISTEMP(val - 1, data->uch_config)) { | 710 | if (!ISTEMP(val - 1, data->uch_config)) { |
@@ -1325,15 +1328,15 @@ static int __init vt1211_init(void) | |||
1325 | 1328 | ||
1326 | if ((uch_config < -1) || (uch_config > 31)) { | 1329 | if ((uch_config < -1) || (uch_config > 31)) { |
1327 | err = -EINVAL; | 1330 | err = -EINVAL; |
1328 | pr_warn("Invalid UCH configuration %d. " | 1331 | pr_warn("Invalid UCH configuration %d. Choose a value between 0 and 31.\n", |
1329 | "Choose a value between 0 and 31.\n", uch_config); | 1332 | uch_config); |
1330 | goto EXIT; | 1333 | goto EXIT; |
1331 | } | 1334 | } |
1332 | 1335 | ||
1333 | if ((int_mode < -1) || (int_mode > 0)) { | 1336 | if ((int_mode < -1) || (int_mode > 0)) { |
1334 | err = -EINVAL; | 1337 | err = -EINVAL; |
1335 | pr_warn("Invalid interrupt mode %d. " | 1338 | pr_warn("Invalid interrupt mode %d. Only mode 0 is supported.\n", |
1336 | "Only mode 0 is supported.\n", int_mode); | 1339 | int_mode); |
1337 | goto EXIT; | 1340 | goto EXIT; |
1338 | } | 1341 | } |
1339 | 1342 | ||
diff --git a/drivers/hwmon/vt8231.c b/drivers/hwmon/vt8231.c index 988a2a796764..0e7017841f7d 100644 --- a/drivers/hwmon/vt8231.c +++ b/drivers/hwmon/vt8231.c | |||
@@ -573,8 +573,9 @@ static ssize_t set_fan_div(struct device *dev, struct device_attribute *attr, | |||
573 | data->fan_div[nr] = 3; | 573 | data->fan_div[nr] = 3; |
574 | break; | 574 | break; |
575 | default: | 575 | default: |
576 | dev_err(dev, "fan_div value %ld not supported. " | 576 | dev_err(dev, |
577 | "Choose one of 1, 2, 4 or 8!\n", val); | 577 | "fan_div value %ld not supported. Choose one of 1, 2, 4 or 8!\n", |
578 | val); | ||
578 | mutex_unlock(&data->update_lock); | 579 | mutex_unlock(&data->update_lock); |
579 | return -EINVAL; | 580 | return -EINVAL; |
580 | } | 581 | } |
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index 0a89211c25f6..016027229e81 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c | |||
@@ -840,8 +840,8 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) | |||
840 | && (reg >= 0xff || (sio_data->kind == nct6775 | 840 | && (reg >= 0xff || (sio_data->kind == nct6775 |
841 | && reg == 0x00)) | 841 | && reg == 0x00)) |
842 | && data->fan_div[i] < 0x07) { | 842 | && data->fan_div[i] < 0x07) { |
843 | dev_dbg(dev, "Increasing fan%d " | 843 | dev_dbg(dev, |
844 | "clock divider from %u to %u\n", | 844 | "Increasing fan%d clock divider from %u to %u\n", |
845 | i + 1, div_from_reg(data->fan_div[i]), | 845 | i + 1, div_from_reg(data->fan_div[i]), |
846 | div_from_reg(data->fan_div[i] + 1)); | 846 | div_from_reg(data->fan_div[i] + 1)); |
847 | data->fan_div[i]++; | 847 | data->fan_div[i]++; |
@@ -1110,9 +1110,9 @@ store_fan_min(struct device *dev, struct device_attribute *attr, | |||
1110 | */ | 1110 | */ |
1111 | data->fan_min[nr] = 254; | 1111 | data->fan_min[nr] = 254; |
1112 | new_div = 7; /* 128 == (1 << 7) */ | 1112 | new_div = 7; /* 128 == (1 << 7) */ |
1113 | dev_warn(dev, "fan%u low limit %lu below minimum %u, set to " | 1113 | dev_warn(dev, |
1114 | "minimum\n", nr + 1, val, | 1114 | "fan%u low limit %lu below minimum %u, set to minimum\n", |
1115 | data->fan_from_reg_min(254, 7)); | 1115 | nr + 1, val, data->fan_from_reg_min(254, 7)); |
1116 | } else if (!reg) { | 1116 | } else if (!reg) { |
1117 | /* | 1117 | /* |
1118 | * Speed above this value cannot possibly be represented, | 1118 | * Speed above this value cannot possibly be represented, |
@@ -1120,9 +1120,9 @@ store_fan_min(struct device *dev, struct device_attribute *attr, | |||
1120 | */ | 1120 | */ |
1121 | data->fan_min[nr] = 1; | 1121 | data->fan_min[nr] = 1; |
1122 | new_div = 0; /* 1 == (1 << 0) */ | 1122 | new_div = 0; /* 1 == (1 << 0) */ |
1123 | dev_warn(dev, "fan%u low limit %lu above maximum %u, set to " | 1123 | dev_warn(dev, |
1124 | "maximum\n", nr + 1, val, | 1124 | "fan%u low limit %lu above maximum %u, set to maximum\n", |
1125 | data->fan_from_reg_min(1, 0)); | 1125 | nr + 1, val, data->fan_from_reg_min(1, 0)); |
1126 | } else { | 1126 | } else { |
1127 | /* | 1127 | /* |
1128 | * Automatically pick the best divider, i.e. the one such | 1128 | * Automatically pick the best divider, i.e. the one such |
@@ -2396,15 +2396,15 @@ static int w83627ehf_probe(struct platform_device *pdev) | |||
2396 | en_vrm10 = superio_inb(sio_data->sioreg, | 2396 | en_vrm10 = superio_inb(sio_data->sioreg, |
2397 | SIO_REG_EN_VRM10); | 2397 | SIO_REG_EN_VRM10); |
2398 | if ((en_vrm10 & 0x08) && data->vrm == 90) { | 2398 | if ((en_vrm10 & 0x08) && data->vrm == 90) { |
2399 | dev_warn(dev, "Setting VID input " | 2399 | dev_warn(dev, |
2400 | "voltage to TTL\n"); | 2400 | "Setting VID input voltage to TTL\n"); |
2401 | superio_outb(sio_data->sioreg, | 2401 | superio_outb(sio_data->sioreg, |
2402 | SIO_REG_EN_VRM10, | 2402 | SIO_REG_EN_VRM10, |
2403 | en_vrm10 & ~0x08); | 2403 | en_vrm10 & ~0x08); |
2404 | } else if (!(en_vrm10 & 0x08) | 2404 | } else if (!(en_vrm10 & 0x08) |
2405 | && data->vrm == 100) { | 2405 | && data->vrm == 100) { |
2406 | dev_warn(dev, "Setting VID input " | 2406 | dev_warn(dev, |
2407 | "voltage to VRM10\n"); | 2407 | "Setting VID input voltage to VRM10\n"); |
2408 | superio_outb(sio_data->sioreg, | 2408 | superio_outb(sio_data->sioreg, |
2409 | SIO_REG_EN_VRM10, | 2409 | SIO_REG_EN_VRM10, |
2410 | en_vrm10 | 0x08); | 2410 | en_vrm10 | 0x08); |
@@ -2420,8 +2420,8 @@ static int w83627ehf_probe(struct platform_device *pdev) | |||
2420 | if (err) | 2420 | if (err) |
2421 | goto exit_release; | 2421 | goto exit_release; |
2422 | } else { | 2422 | } else { |
2423 | dev_info(dev, "VID pins in output mode, CPU VID not " | 2423 | dev_info(dev, |
2424 | "available\n"); | 2424 | "VID pins in output mode, CPU VID not available\n"); |
2425 | } | 2425 | } |
2426 | } | 2426 | } |
2427 | 2427 | ||
@@ -2795,8 +2795,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr, | |||
2795 | /* Activate logical device if needed */ | 2795 | /* Activate logical device if needed */ |
2796 | val = superio_inb(sioaddr, SIO_REG_ENABLE); | 2796 | val = superio_inb(sioaddr, SIO_REG_ENABLE); |
2797 | if (!(val & 0x01)) { | 2797 | if (!(val & 0x01)) { |
2798 | pr_warn("Forcibly enabling Super-I/O. " | 2798 | pr_warn("Forcibly enabling Super-I/O. Sensor is probably unusable.\n"); |
2799 | "Sensor is probably unusable.\n"); | ||
2800 | superio_outb(sioaddr, SIO_REG_ENABLE, val | 0x01); | 2799 | superio_outb(sioaddr, SIO_REG_ENABLE, val | 0x01); |
2801 | } | 2800 | } |
2802 | 2801 | ||
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index aeec5b1d81c9..f9d513949a38 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c | |||
@@ -64,8 +64,8 @@ enum chips { w83781d, w83782d, w83783s, as99127f }; | |||
64 | /* Insmod parameters */ | 64 | /* Insmod parameters */ |
65 | static unsigned short force_subclients[4]; | 65 | static unsigned short force_subclients[4]; |
66 | module_param_array(force_subclients, short, NULL, 0); | 66 | module_param_array(force_subclients, short, NULL, 0); |
67 | MODULE_PARM_DESC(force_subclients, "List of subclient addresses: " | 67 | MODULE_PARM_DESC(force_subclients, |
68 | "{bus, clientaddr, subclientaddr1, subclientaddr2}"); | 68 | "List of subclient addresses: {bus, clientaddr, subclientaddr1, subclientaddr2}"); |
69 | 69 | ||
70 | static bool reset; | 70 | static bool reset; |
71 | module_param(reset, bool, 0); | 71 | module_param(reset, bool, 0); |
@@ -826,8 +826,9 @@ store_sensor(struct device *dev, struct device_attribute *da, | |||
826 | data->sens[nr] = val; | 826 | data->sens[nr] = val; |
827 | break; | 827 | break; |
828 | case W83781D_DEFAULT_BETA: | 828 | case W83781D_DEFAULT_BETA: |
829 | dev_warn(dev, "Sensor type %d is deprecated, please use 4 " | 829 | dev_warn(dev, |
830 | "instead\n", W83781D_DEFAULT_BETA); | 830 | "Sensor type %d is deprecated, please use 4 instead\n", |
831 | W83781D_DEFAULT_BETA); | ||
831 | /* fall through */ | 832 | /* fall through */ |
832 | case 4: /* thermistor */ | 833 | case 4: /* thermistor */ |
833 | tmp = w83781d_read_value(data, W83781D_REG_SCFG1); | 834 | tmp = w83781d_read_value(data, W83781D_REG_SCFG1); |
@@ -874,8 +875,8 @@ w83781d_detect_subclients(struct i2c_client *new_client) | |||
874 | for (i = 2; i <= 3; i++) { | 875 | for (i = 2; i <= 3; i++) { |
875 | if (force_subclients[i] < 0x48 || | 876 | if (force_subclients[i] < 0x48 || |
876 | force_subclients[i] > 0x4f) { | 877 | force_subclients[i] > 0x4f) { |
877 | dev_err(&new_client->dev, "Invalid subclient " | 878 | dev_err(&new_client->dev, |
878 | "address %d; must be 0x48-0x4f\n", | 879 | "Invalid subclient address %d; must be 0x48-0x4f\n", |
879 | force_subclients[i]); | 880 | force_subclients[i]); |
880 | err = -EINVAL; | 881 | err = -EINVAL; |
881 | goto ERROR_SC_1; | 882 | goto ERROR_SC_1; |
@@ -910,9 +911,9 @@ w83781d_detect_subclients(struct i2c_client *new_client) | |||
910 | for (i = 0; i < num_sc; i++) { | 911 | for (i = 0; i < num_sc; i++) { |
911 | data->lm75[i] = i2c_new_dummy(adapter, sc_addr[i]); | 912 | data->lm75[i] = i2c_new_dummy(adapter, sc_addr[i]); |
912 | if (!data->lm75[i]) { | 913 | if (!data->lm75[i]) { |
913 | dev_err(&new_client->dev, "Subclient %d " | 914 | dev_err(&new_client->dev, |
914 | "registration at address 0x%x " | 915 | "Subclient %d registration at address 0x%x failed.\n", |
915 | "failed.\n", i, sc_addr[i]); | 916 | i, sc_addr[i]); |
916 | err = -ENOMEM; | 917 | err = -ENOMEM; |
917 | if (i == 1) | 918 | if (i == 1) |
918 | goto ERROR_SC_3; | 919 | goto ERROR_SC_3; |
@@ -1176,8 +1177,9 @@ w83781d_detect(struct i2c_client *client, struct i2c_board_info *info) | |||
1176 | goto err_nodev; | 1177 | goto err_nodev; |
1177 | 1178 | ||
1178 | if (val1 <= 0x30 && w83781d_alias_detect(client, val1)) { | 1179 | if (val1 <= 0x30 && w83781d_alias_detect(client, val1)) { |
1179 | dev_dbg(&adapter->dev, "Device at 0x%02x appears to " | 1180 | dev_dbg(&adapter->dev, |
1180 | "be the same as ISA device\n", address); | 1181 | "Device at 0x%02x appears to be the same as ISA device\n", |
1182 | address); | ||
1181 | goto err_nodev; | 1183 | goto err_nodev; |
1182 | } | 1184 | } |
1183 | 1185 | ||
@@ -1367,8 +1369,8 @@ w83781d_init_device(struct device *dev) | |||
1367 | * as I see very little reason why this would be needed at | 1369 | * as I see very little reason why this would be needed at |
1368 | * all. | 1370 | * all. |
1369 | */ | 1371 | */ |
1370 | dev_info(dev, "If reset=1 solved a problem you were " | 1372 | dev_info(dev, |
1371 | "having, please report!\n"); | 1373 | "If reset=1 solved a problem you were having, please report!\n"); |
1372 | 1374 | ||
1373 | /* save these registers */ | 1375 | /* save these registers */ |
1374 | i = w83781d_read_value(data, W83781D_REG_BEEP_CONFIG); | 1376 | i = w83781d_read_value(data, W83781D_REG_BEEP_CONFIG); |
@@ -1425,8 +1427,8 @@ w83781d_init_device(struct device *dev) | |||
1425 | /* Enable temp2 */ | 1427 | /* Enable temp2 */ |
1426 | tmp = w83781d_read_value(data, W83781D_REG_TEMP2_CONFIG); | 1428 | tmp = w83781d_read_value(data, W83781D_REG_TEMP2_CONFIG); |
1427 | if (tmp & 0x01) { | 1429 | if (tmp & 0x01) { |
1428 | dev_warn(dev, "Enabling temp2, readings " | 1430 | dev_warn(dev, |
1429 | "might not make sense\n"); | 1431 | "Enabling temp2, readings might not make sense\n"); |
1430 | w83781d_write_value(data, W83781D_REG_TEMP2_CONFIG, | 1432 | w83781d_write_value(data, W83781D_REG_TEMP2_CONFIG, |
1431 | tmp & 0xfe); | 1433 | tmp & 0xfe); |
1432 | } | 1434 | } |
@@ -1436,8 +1438,8 @@ w83781d_init_device(struct device *dev) | |||
1436 | tmp = w83781d_read_value(data, | 1438 | tmp = w83781d_read_value(data, |
1437 | W83781D_REG_TEMP3_CONFIG); | 1439 | W83781D_REG_TEMP3_CONFIG); |
1438 | if (tmp & 0x01) { | 1440 | if (tmp & 0x01) { |
1439 | dev_warn(dev, "Enabling temp3, " | 1441 | dev_warn(dev, |
1440 | "readings might not make sense\n"); | 1442 | "Enabling temp3, readings might not make sense\n"); |
1441 | w83781d_write_value(data, | 1443 | w83781d_write_value(data, |
1442 | W83781D_REG_TEMP3_CONFIG, tmp & 0xfe); | 1444 | W83781D_REG_TEMP3_CONFIG, tmp & 0xfe); |
1443 | } | 1445 | } |
diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c index 38dddddf8875..a3feee332e20 100644 --- a/drivers/hwmon/w83791d.c +++ b/drivers/hwmon/w83791d.c | |||
@@ -56,8 +56,8 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, | |||
56 | 56 | ||
57 | static unsigned short force_subclients[4]; | 57 | static unsigned short force_subclients[4]; |
58 | module_param_array(force_subclients, short, NULL, 0); | 58 | module_param_array(force_subclients, short, NULL, 0); |
59 | MODULE_PARM_DESC(force_subclients, "List of subclient addresses: " | 59 | MODULE_PARM_DESC(force_subclients, |
60 | "{bus, clientaddr, subclientaddr1, subclientaddr2}"); | 60 | "List of subclient addresses: {bus, clientaddr, subclientaddr1, subclientaddr2}"); |
61 | 61 | ||
62 | static bool reset; | 62 | static bool reset; |
63 | module_param(reset, bool, 0); | 63 | module_param(reset, bool, 0); |
diff --git a/drivers/hwmon/w83792d.c b/drivers/hwmon/w83792d.c index 5cb83ddf2cc6..0b804895be43 100644 --- a/drivers/hwmon/w83792d.c +++ b/drivers/hwmon/w83792d.c | |||
@@ -54,8 +54,8 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, | |||
54 | 54 | ||
55 | static unsigned short force_subclients[4]; | 55 | static unsigned short force_subclients[4]; |
56 | module_param_array(force_subclients, short, NULL, 0); | 56 | module_param_array(force_subclients, short, NULL, 0); |
57 | MODULE_PARM_DESC(force_subclients, "List of subclient addresses: " | 57 | MODULE_PARM_DESC(force_subclients, |
58 | "{bus, clientaddr, subclientaddr1, subclientaddr2}"); | 58 | "List of subclient addresses: {bus, clientaddr, subclientaddr1, subclientaddr2}"); |
59 | 59 | ||
60 | static bool init; | 60 | static bool init; |
61 | module_param(init, bool, 0); | 61 | module_param(init, bool, 0); |
@@ -951,8 +951,8 @@ w83792d_detect_subclients(struct i2c_client *new_client) | |||
951 | for (i = 2; i <= 3; i++) { | 951 | for (i = 2; i <= 3; i++) { |
952 | if (force_subclients[i] < 0x48 || | 952 | if (force_subclients[i] < 0x48 || |
953 | force_subclients[i] > 0x4f) { | 953 | force_subclients[i] > 0x4f) { |
954 | dev_err(&new_client->dev, "invalid subclient " | 954 | dev_err(&new_client->dev, |
955 | "address %d; must be 0x48-0x4f\n", | 955 | "invalid subclient address %d; must be 0x48-0x4f\n", |
956 | force_subclients[i]); | 956 | force_subclients[i]); |
957 | err = -ENODEV; | 957 | err = -ENODEV; |
958 | goto ERROR_SC_0; | 958 | goto ERROR_SC_0; |
@@ -969,8 +969,9 @@ w83792d_detect_subclients(struct i2c_client *new_client) | |||
969 | if (!(val & 0x80)) { | 969 | if (!(val & 0x80)) { |
970 | if ((data->lm75[0] != NULL) && | 970 | if ((data->lm75[0] != NULL) && |
971 | ((val & 0x7) == ((val >> 4) & 0x7))) { | 971 | ((val & 0x7) == ((val >> 4) & 0x7))) { |
972 | dev_err(&new_client->dev, "duplicate addresses 0x%x, " | 972 | dev_err(&new_client->dev, |
973 | "use force_subclient\n", data->lm75[0]->addr); | 973 | "duplicate addresses 0x%x, use force_subclient\n", |
974 | data->lm75[0]->addr); | ||
974 | err = -ENODEV; | 975 | err = -ENODEV; |
975 | goto ERROR_SC_1; | 976 | goto ERROR_SC_1; |
976 | } | 977 | } |
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c index 660427520c53..b0c30a546ff2 100644 --- a/drivers/hwmon/w83793.c +++ b/drivers/hwmon/w83793.c | |||
@@ -59,8 +59,8 @@ static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, | |||
59 | 59 | ||
60 | static unsigned short force_subclients[4]; | 60 | static unsigned short force_subclients[4]; |
61 | module_param_array(force_subclients, short, NULL, 0); | 61 | module_param_array(force_subclients, short, NULL, 0); |
62 | MODULE_PARM_DESC(force_subclients, "List of subclient addresses: " | 62 | MODULE_PARM_DESC(force_subclients, |
63 | "{bus, clientaddr, subclientaddr1, subclientaddr2}"); | 63 | "List of subclient addresses: {bus, clientaddr, subclientaddr1, subclientaddr2}"); |
64 | 64 | ||
65 | static bool reset; | 65 | static bool reset; |
66 | module_param(reset, bool, 0); | 66 | module_param(reset, bool, 0); |
@@ -1921,8 +1921,8 @@ static int w83793_probe(struct i2c_client *client, | |||
1921 | } | 1921 | } |
1922 | if (i == ARRAY_SIZE(watchdog_minors)) { | 1922 | if (i == ARRAY_SIZE(watchdog_minors)) { |
1923 | data->watchdog_miscdev.minor = 0; | 1923 | data->watchdog_miscdev.minor = 0; |
1924 | dev_warn(&client->dev, "Couldn't register watchdog chardev " | 1924 | dev_warn(&client->dev, |
1925 | "(due to no free minor)\n"); | 1925 | "Couldn't register watchdog chardev (due to no free minor)\n"); |
1926 | } | 1926 | } |
1927 | 1927 | ||
1928 | mutex_unlock(&watchdog_data_mutex); | 1928 | mutex_unlock(&watchdog_data_mutex); |
diff --git a/drivers/hwmon/w83795.c b/drivers/hwmon/w83795.c index e226096148eb..908209d24664 100644 --- a/drivers/hwmon/w83795.c +++ b/drivers/hwmon/w83795.c | |||
@@ -2120,11 +2120,12 @@ static void w83795_check_dynamic_in_limits(struct i2c_client *client) | |||
2120 | &w83795_in[i][3].dev_attr.attr, | 2120 | &w83795_in[i][3].dev_attr.attr, |
2121 | S_IRUGO); | 2121 | S_IRUGO); |
2122 | if (err_max || err_min) | 2122 | if (err_max || err_min) |
2123 | dev_warn(&client->dev, "Failed to set in%d limits " | 2123 | dev_warn(&client->dev, |
2124 | "read-only (%d, %d)\n", i, err_max, err_min); | 2124 | "Failed to set in%d limits read-only (%d, %d)\n", |
2125 | i, err_max, err_min); | ||
2125 | else | 2126 | else |
2126 | dev_info(&client->dev, "in%d limits set dynamically " | 2127 | dev_info(&client->dev, |
2127 | "from VID\n", i); | 2128 | "in%d limits set dynamically from VID\n", i); |
2128 | } | 2129 | } |
2129 | } | 2130 | } |
2130 | 2131 | ||