diff options
Diffstat (limited to 'drivers/hwmon/pc87360.c')
-rw-r--r-- | drivers/hwmon/pc87360.c | 25 |
1 files changed, 12 insertions, 13 deletions
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 | } |