aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/dme1737.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hwmon/dme1737.c')
-rw-r--r--drivers/hwmon/dme1737.c68
1 files changed, 34 insertions, 34 deletions
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
56static bool probe_all_addr; 56static bool probe_all_addr;
57module_param(probe_all_addr, bool, 0); 57module_param(probe_all_addr, bool, 0);
58MODULE_PARM_DESC(probe_all_addr, "Include probing of non-standard LPC " 58MODULE_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 */
62static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END}; 62static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END};
63 63
64enum chips { dme1737, sch5027, sch311x, sch5127 }; 64enum 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);