diff options
author | Guenter Roeck <linux@roeck-us.net> | 2012-12-19 16:17:01 -0500 |
---|---|---|
committer | Jean Delvare <khali@endymion.delvare> | 2012-12-19 16:17:01 -0500 |
commit | 1d9bcf6aef0af67901a54ad4c4458e6a2124b769 (patch) | |
tree | 44b9af3fa5d9171a5d7f6a55cca150afee7bb24a /drivers/hwmon | |
parent | e1169ba0aea187d0ea15d6f98bc818cab37335e5 (diff) |
hwmon: (it87) Avoid quoted string splits across lines
Fix the respective checkpatch warnings.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/it87.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index e0d1910c04d9..28fbafccfe77 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c | |||
@@ -644,8 +644,8 @@ static ssize_t set_temp_type(struct device *dev, struct device_attribute *attr, | |||
644 | reg &= ~(1 << nr); | 644 | reg &= ~(1 << nr); |
645 | reg &= ~(8 << nr); | 645 | reg &= ~(8 << nr); |
646 | if (val == 2) { /* backwards compatibility */ | 646 | if (val == 2) { /* backwards compatibility */ |
647 | dev_warn(dev, "Sensor type 2 is deprecated, please use 4 " | 647 | dev_warn(dev, |
648 | "instead\n"); | 648 | "Sensor type 2 is deprecated, please use 4 instead\n"); |
649 | val = 4; | 649 | val = 4; |
650 | } | 650 | } |
651 | /* 3 = thermal diode; 4 = thermistor; 0 = disabled */ | 651 | /* 3 = thermal diode; 4 = thermistor; 0 = disabled */ |
@@ -847,8 +847,8 @@ static int check_trip_points(struct device *dev, int nr) | |||
847 | } | 847 | } |
848 | 848 | ||
849 | if (err) { | 849 | if (err) { |
850 | dev_err(dev, "Inconsistent trip points, not switching to " | 850 | dev_err(dev, |
851 | "automatic mode\n"); | 851 | "Inconsistent trip points, not switching to automatic mode\n"); |
852 | dev_err(dev, "Adjust the trip points and try again\n"); | 852 | dev_err(dev, "Adjust the trip points and try again\n"); |
853 | } | 853 | } |
854 | return err; | 854 | return err; |
@@ -2176,8 +2176,8 @@ static int it87_check_pwm(struct device *dev) | |||
2176 | * PWM interface). | 2176 | * PWM interface). |
2177 | */ | 2177 | */ |
2178 | if (!((pwm[0] | pwm[1] | pwm[2]) & 0x80)) { | 2178 | if (!((pwm[0] | pwm[1] | pwm[2]) & 0x80)) { |
2179 | dev_info(dev, "Reconfiguring PWM to " | 2179 | dev_info(dev, |
2180 | "active high polarity\n"); | 2180 | "Reconfiguring PWM to active high polarity\n"); |
2181 | it87_write_value(data, IT87_REG_FAN_CTL, | 2181 | it87_write_value(data, IT87_REG_FAN_CTL, |
2182 | tmp | 0x87); | 2182 | tmp | 0x87); |
2183 | for (i = 0; i < 3; i++) | 2183 | for (i = 0; i < 3; i++) |
@@ -2187,16 +2187,16 @@ static int it87_check_pwm(struct device *dev) | |||
2187 | return 1; | 2187 | return 1; |
2188 | } | 2188 | } |
2189 | 2189 | ||
2190 | dev_info(dev, "PWM configuration is " | 2190 | dev_info(dev, |
2191 | "too broken to be fixed\n"); | 2191 | "PWM configuration is too broken to be fixed\n"); |
2192 | } | 2192 | } |
2193 | 2193 | ||
2194 | dev_info(dev, "Detected broken BIOS " | 2194 | dev_info(dev, |
2195 | "defaults, disabling PWM interface\n"); | 2195 | "Detected broken BIOS defaults, disabling PWM interface\n"); |
2196 | return 0; | 2196 | return 0; |
2197 | } else if (fix_pwm_polarity) { | 2197 | } else if (fix_pwm_polarity) { |
2198 | dev_info(dev, "PWM configuration looks " | 2198 | dev_info(dev, |
2199 | "sane, won't touch\n"); | 2199 | "PWM configuration looks sane, won't touch\n"); |
2200 | } | 2200 | } |
2201 | 2201 | ||
2202 | return 1; | 2202 | return 1; |
@@ -2508,8 +2508,7 @@ static void __exit sm_it87_exit(void) | |||
2508 | } | 2508 | } |
2509 | 2509 | ||
2510 | 2510 | ||
2511 | MODULE_AUTHOR("Chris Gauthron, " | 2511 | MODULE_AUTHOR("Chris Gauthron, Jean Delvare <khali@linux-fr.org>"); |
2512 | "Jean Delvare <khali@linux-fr.org>"); | ||
2513 | MODULE_DESCRIPTION("IT8705F/IT871xF/IT872xF hardware monitoring driver"); | 2512 | MODULE_DESCRIPTION("IT8705F/IT871xF/IT872xF hardware monitoring driver"); |
2514 | module_param(update_vbat, bool, 0); | 2513 | module_param(update_vbat, bool, 0); |
2515 | MODULE_PARM_DESC(update_vbat, "Update vbat if set else return powerup value"); | 2514 | MODULE_PARM_DESC(update_vbat, "Update vbat if set else return powerup value"); |