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/hwmon/w83781d.c | |
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/hwmon/w83781d.c')
-rw-r--r-- | drivers/hwmon/w83781d.c | 36 |
1 files changed, 19 insertions, 17 deletions
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 | } |