Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (nct6775) Add blank lines after declarations

checkpatch complains about
WARNING: Missing a blank line after declarations

Add missing blank lines. Also reorder variables length-wise where appropriate
if a function header is touched anyway.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

+24 -6
+24 -6
drivers/hwmon/nct6775.c
··· 1073 1073 static inline void nct6775_set_bank(struct nct6775_data *data, u16 reg) 1074 1074 { 1075 1075 u8 bank = reg >> 8; 1076 + 1076 1077 if (data->bank != bank) { 1077 1078 outb_p(NCT6775_REG_BANK, data->addr + ADDR_REG_OFFSET); 1078 1079 outb_p(bank, data->addr + DATA_REG_OFFSET); ··· 1311 1310 if (!data->target_speed_tolerance[i] || 1312 1311 data->pwm_enable[i] == speed_cruise) { 1313 1312 u8 t = fanmodecfg & 0x0f; 1313 + 1314 1314 if (data->REG_TOLERANCE_H) { 1315 1315 t |= (nct6775_read_value(data, 1316 1316 data->REG_TOLERANCE_H[i]) & 0x70) >> 1; ··· 1486 1484 data->alarms = 0; 1487 1485 for (i = 0; i < NUM_REG_ALARM; i++) { 1488 1486 u8 alarm; 1487 + 1489 1488 if (!data->REG_ALARM[i]) 1490 1489 continue; 1491 1490 alarm = nct6775_read_value(data, data->REG_ALARM[i]); ··· 1496 1493 data->beeps = 0; 1497 1494 for (i = 0; i < NUM_REG_BEEP; i++) { 1498 1495 u8 beep; 1496 + 1499 1497 if (!data->REG_BEEP[i]) 1500 1498 continue; 1501 1499 beep = nct6775_read_value(data, data->REG_BEEP[i]); ··· 1519 1515 { 1520 1516 struct nct6775_data *data = nct6775_update_device(dev); 1521 1517 struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr); 1522 - int nr = sattr->nr; 1523 1518 int index = sattr->index; 1519 + int nr = sattr->nr; 1520 + 1524 1521 return sprintf(buf, "%ld\n", in_from_reg(data->in[nr][index], nr)); 1525 1522 } 1526 1523 ··· 1531 1526 { 1532 1527 struct nct6775_data *data = dev_get_drvdata(dev); 1533 1528 struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr); 1534 - int nr = sattr->nr; 1535 1529 int index = sattr->index; 1530 + int nr = sattr->nr; 1536 1531 unsigned long val; 1537 - int err = kstrtoul(buf, 10, &val); 1532 + int err; 1533 + 1534 + err = kstrtoul(buf, 10, &val); 1538 1535 if (err < 0) 1539 1536 return err; 1540 1537 mutex_lock(&data->update_lock); ··· 1553 1546 struct nct6775_data *data = nct6775_update_device(dev); 1554 1547 struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr); 1555 1548 int nr = data->ALARM_BITS[sattr->index]; 1549 + 1556 1550 return sprintf(buf, "%u\n", 1557 1551 (unsigned int)((data->alarms >> nr) & 0x01)); 1558 1552 } ··· 1589 1581 nr = find_temp_source(data, sattr->index, data->num_temp_alarms); 1590 1582 if (nr >= 0) { 1591 1583 int bit = data->ALARM_BITS[nr + TEMP_ALARM_BASE]; 1584 + 1592 1585 alarm = (data->alarms >> bit) & 0x01; 1593 1586 } 1594 1587 return sprintf(buf, "%u\n", alarm); ··· 1615 1606 int nr = data->BEEP_BITS[sattr->index]; 1616 1607 int regindex = nr >> 3; 1617 1608 unsigned long val; 1609 + int err; 1618 1610 1619 - int err = kstrtoul(buf, 10, &val); 1611 + err = kstrtoul(buf, 10, &val); 1620 1612 if (err < 0) 1621 1613 return err; 1622 1614 if (val > 1) ··· 1650 1640 nr = find_temp_source(data, sattr->index, data->num_temp_beeps); 1651 1641 if (nr >= 0) { 1652 1642 int bit = data->BEEP_BITS[nr + TEMP_ALARM_BASE]; 1643 + 1653 1644 beep = (data->beeps >> bit) & 0x01; 1654 1645 } 1655 1646 return sprintf(buf, "%u\n", beep); ··· 1664 1653 struct nct6775_data *data = dev_get_drvdata(dev); 1665 1654 int nr, bit, regindex; 1666 1655 unsigned long val; 1656 + int err; 1667 1657 1668 - int err = kstrtoul(buf, 10, &val); 1658 + err = kstrtoul(buf, 10, &val); 1669 1659 if (err < 0) 1670 1660 return err; 1671 1661 if (val > 1) ··· 1738 1726 struct nct6775_data *data = nct6775_update_device(dev); 1739 1727 struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr); 1740 1728 int nr = sattr->index; 1729 + 1741 1730 return sprintf(buf, "%d\n", data->rpm[nr]); 1742 1731 } 1743 1732 ··· 1748 1735 struct nct6775_data *data = nct6775_update_device(dev); 1749 1736 struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr); 1750 1737 int nr = sattr->index; 1738 + 1751 1739 return sprintf(buf, "%d\n", 1752 1740 data->fan_from_reg_min(data->fan_min[nr], 1753 1741 data->fan_div[nr])); ··· 1760 1746 struct nct6775_data *data = nct6775_update_device(dev); 1761 1747 struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr); 1762 1748 int nr = sattr->index; 1749 + 1763 1750 return sprintf(buf, "%u\n", div_from_reg(data->fan_div[nr])); 1764 1751 } 1765 1752 ··· 1772 1757 struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr); 1773 1758 int nr = sattr->index; 1774 1759 unsigned long val; 1775 - int err; 1776 1760 unsigned int reg; 1777 1761 u8 new_div; 1762 + int err; 1778 1763 1779 1764 err = kstrtoul(buf, 10, &val); 1780 1765 if (err < 0) ··· 1958 1943 struct nct6775_data *data = nct6775_update_device(dev); 1959 1944 struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr); 1960 1945 int nr = sattr->index; 1946 + 1961 1947 return sprintf(buf, "%s\n", data->temp_label[data->temp_src[nr]]); 1962 1948 } 1963 1949 ··· 2035 2019 struct nct6775_data *data = nct6775_update_device(dev); 2036 2020 struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr); 2037 2021 int nr = sattr->index; 2022 + 2038 2023 return sprintf(buf, "%d\n", (int)data->temp_type[nr]); 2039 2024 } 2040 2025 ··· 3026 3009 show_vid(struct device *dev, struct device_attribute *attr, char *buf) 3027 3010 { 3028 3011 struct nct6775_data *data = dev_get_drvdata(dev); 3012 + 3029 3013 return sprintf(buf, "%d\n", vid_from_reg(data->vid, data->vrm)); 3030 3014 } 3031 3015