Merge tag 'nfs-for-3.10-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / drivers / hwmon / w83627ehf.c

diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index 0a89211c25f6df2ad94efdb472a6cf547f502422..016027229e81835f205f0cf90afb6a4575043d63 100644 (file)
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -840,8 +840,8 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
                            && (reg >= 0xff || (sio_data->kind == nct6775
                                                && reg == 0x00))
                            && data->fan_div[i] < 0x07) {
-                               dev_dbg(dev, "Increasing fan%d "
-                                       "clock divider from %u to %u\n",
+                               dev_dbg(dev,
+                                       "Increasing fan%d clock divider from %u to %u\n",
                                        i + 1, div_from_reg(data->fan_div[i]),
                                        div_from_reg(data->fan_div[i] + 1));
                                data->fan_div[i]++;
@@ -1110,9 +1110,9 @@ store_fan_min(struct device *dev, struct device_attribute *attr,
                 */
                data->fan_min[nr] = 254;
                new_div = 7; /* 128 == (1 << 7) */
-               dev_warn(dev, "fan%u low limit %lu below minimum %u, set to "
-                        "minimum\n", nr + 1, val,
-                        data->fan_from_reg_min(254, 7));
+               dev_warn(dev,
+                        "fan%u low limit %lu below minimum %u, set to minimum\n",
+                        nr + 1, val, data->fan_from_reg_min(254, 7));
        } else if (!reg) {
                /*
                 * Speed above this value cannot possibly be represented,
@@ -1120,9 +1120,9 @@ store_fan_min(struct device *dev, struct device_attribute *attr,
                 */
                data->fan_min[nr] = 1;
                new_div = 0; /* 1 == (1 << 0) */
-               dev_warn(dev, "fan%u low limit %lu above maximum %u, set to "
-                        "maximum\n", nr + 1, val,
-                        data->fan_from_reg_min(1, 0));
+               dev_warn(dev,
+                        "fan%u low limit %lu above maximum %u, set to maximum\n",
+                        nr + 1, val, data->fan_from_reg_min(1, 0));
        } else {
                /*
                 * Automatically pick the best divider, i.e. the one such
@@ -2396,15 +2396,15 @@ static int w83627ehf_probe(struct platform_device *pdev)
                                en_vrm10 = superio_inb(sio_data->sioreg,
                                                       SIO_REG_EN_VRM10);
                                if ((en_vrm10 & 0x08) && data->vrm == 90) {
-                                       dev_warn(dev, "Setting VID input "
-                                                "voltage to TTL\n");
+                                       dev_warn(dev,
+                                                "Setting VID input voltage to TTL\n");
                                        superio_outb(sio_data->sioreg,
                                                     SIO_REG_EN_VRM10,
                                                     en_vrm10 & ~0x08);
                                } else if (!(en_vrm10 & 0x08)
                                           && data->vrm == 100) {
-                                       dev_warn(dev, "Setting VID input "
-                                                "voltage to VRM10\n");
+                                       dev_warn(dev,
+                                                "Setting VID input voltage to VRM10\n");
                                        superio_outb(sio_data->sioreg,
                                                     SIO_REG_EN_VRM10,
                                                     en_vrm10 | 0x08);
@@ -2420,8 +2420,8 @@ static int w83627ehf_probe(struct platform_device *pdev)
                        if (err)
                                goto exit_release;
                } else {
-                       dev_info(dev, "VID pins in output mode, CPU VID not "
-                                "available\n");
+                       dev_info(dev,
+                                "VID pins in output mode, CPU VID not available\n");
                }
        }
 
@@ -2795,8 +2795,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
        /* Activate logical device if needed */
        val = superio_inb(sioaddr, SIO_REG_ENABLE);
        if (!(val & 0x01)) {
-               pr_warn("Forcibly enabling Super-I/O. "
-                       "Sensor is probably unusable.\n");
+               pr_warn("Forcibly enabling Super-I/O. Sensor is probably unusable.\n");
                superio_outb(sioaddr, SIO_REG_ENABLE, val | 0x01);
        }