hwmon: (pmbus/core) Fix various coding style issues

Checkpatch reports bad multi-line comments, bad multi-line alignments,
missing blank lines after variable declarations, unnecessary empty lines,
unnecessary spaces, and unnecessary braces. Fix most of the reported
problems except for some multi-line alignment problems.

Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index cdde8b03a6e954a3a23a2952a243177fa78d495b..c4a88233e4540585a901604e6741c7ed26ec169a 100644 (file)
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -44,8 +44,7 @@ struct pmbus_sensor {
        enum pmbus_sensor_classes class;        /* sensor class */
        bool update;            /* runtime sensor update needed */
        bool convert;           /* Whether or not to apply linear/vid/direct */
-       int data;               /* Sensor data.
-                                  Negative if there was a read error */
+       int data;               /* Sensor data; negative if there was a read error */
 };
 #define to_pmbus_sensor(_attr) \
        container_of(_attr, struct pmbus_sensor, attribute)
@@ -192,11 +191,10 @@ static void pmbus_update_ts(struct i2c_client *client, bool write_op)
        struct pmbus_data *data = i2c_get_clientdata(client);
        const struct pmbus_driver_info *info = data->info;
 
-       if (info->access_delay) {
+       if (info->access_delay)
                data->access_time = ktime_get();
-       } else if (info->write_delay && write_op) {
+       else if (info->write_delay && write_op)
                data->write_time = ktime_get();
-       }
 }
 
 int pmbus_set_page(struct i2c_client *client, int page, int phase)
@@ -292,7 +290,6 @@ int pmbus_write_word_data(struct i2c_client *client, int page, u8 reg,
 }
 EXPORT_SYMBOL_NS_GPL(pmbus_write_word_data, "PMBUS");
 
-
 static int pmbus_write_virt_reg(struct i2c_client *client, int page, int reg,
                                u16 word)
 {
@@ -381,14 +378,14 @@ int pmbus_update_fan(struct i2c_client *client, int page, int id,
        u8 to;
 
        from = _pmbus_read_byte_data(client, page,
-                                   pmbus_fan_config_registers[id]);
+                                    pmbus_fan_config_registers[id]);
        if (from < 0)
                return from;
 
        to = (from & ~mask) | (config & mask);
        if (to != from) {
                rv = _pmbus_write_byte_data(client, page,
-                                          pmbus_fan_config_registers[id], to);
+                                           pmbus_fan_config_registers[id], to);
                if (rv < 0)
                        return rv;
        }
@@ -563,7 +560,7 @@ static int pmbus_get_fan_rate(struct i2c_client *client, int page, int id,
        }
 
        config = _pmbus_read_byte_data(client, page,
-                                     pmbus_fan_config_registers[id]);
+                                      pmbus_fan_config_registers[id]);
        if (config < 0)
                return config;
 
@@ -788,7 +785,7 @@ static s64 pmbus_reg2data_linear(struct pmbus_data *data,
 
        if (sensor->class == PSC_VOLTAGE_OUT) { /* LINEAR16 */
                exponent = data->exponent[sensor->page];
-               mantissa = (u16) sensor->data;
+               mantissa = (u16)sensor->data;
        } else {                                /* LINEAR11 */
                exponent = ((s16)sensor->data) >> 11;
                mantissa = ((s16)((sensor->data & 0x7ff) << 5)) >> 5;
@@ -1173,7 +1170,6 @@ static int pmbus_get_boolean(struct i2c_client *client, struct pmbus_boolean *b,
                } else {
                        pmbus_clear_fault_page(client, page);
                }
-
        }
        if (s1 && s2) {
                s64 v1, v2;
@@ -1499,8 +1495,7 @@ struct pmbus_limit_attr {
        u16 reg;                /* Limit register */
        u16 sbit;               /* Alarm attribute status bit */
        bool update;            /* True if register needs updates */
-       bool low;               /* True if low limit; for limits with compare
-                                  functions only */
+       bool low;               /* True if low limit; for limits with compare functions only */
        const char *attr;       /* Attribute name */
        const char *alarm;      /* Alarm attribute name */
 };
@@ -2211,8 +2206,8 @@ static const u32 pmbus_fan_status_flags[] = {
 
 /* Precondition: FAN_CONFIG_x_y and FAN_COMMAND_x must exist for the fan ID */
 static int pmbus_add_fan_ctrl(struct i2c_client *client,
-               struct pmbus_data *data, int index, int page, int id,
-               u8 config)
+                             struct pmbus_data *data, int index, int page,
+                             int id, u8 config)
 {
        struct pmbus_sensor *sensor;
 
@@ -2224,7 +2219,7 @@ static int pmbus_add_fan_ctrl(struct i2c_client *client,
                return -ENOMEM;
 
        if (!((data->info->func[page] & PMBUS_HAVE_PWM12) ||
-                       (data->info->func[page] & PMBUS_HAVE_PWM34)))
+             (data->info->func[page] & PMBUS_HAVE_PWM34)))
                return 0;
 
        sensor = pmbus_add_sensor(data, "pwm", NULL, index, page,
@@ -2934,7 +2929,7 @@ static void pmbus_notify(struct pmbus_data *data, int page, int reg, int flags)
 }
 
 static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flags,
-                          unsigned int *event, bool notify)
+                           unsigned int *event, bool notify)
 {
        int i, status;
        const struct pmbus_status_category *cat;
@@ -2963,7 +2958,6 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flag
 
                if (notify && status)
                        pmbus_notify(data, page, cat->reg, status);
-
        }
 
        /*
@@ -3014,7 +3008,6 @@ static int _pmbus_get_flags(struct pmbus_data *data, u8 page, unsigned int *flag
                *event |= REGULATOR_EVENT_OVER_TEMP_WARN;
        }
 
-
        return 0;
 }
 
@@ -3227,7 +3220,7 @@ static int pmbus_regulator_set_voltage(struct regulator_dev *rdev, int min_uv,
 }
 
 static int pmbus_regulator_list_voltage(struct regulator_dev *rdev,
-                                        unsigned int selector)
+                                       unsigned int selector)
 {
        struct device *dev = rdev_get_dev(rdev);
        struct i2c_client *client = to_i2c_client(dev->parent);
@@ -3362,8 +3355,8 @@ static irqreturn_t pmbus_fault_handler(int irq, void *pdata)
 {
        struct pmbus_data *data = pdata;
        struct i2c_client *client = to_i2c_client(data->dev);
-
        int i, status, event;
+
        mutex_lock(&data->update_lock);
        for (i = 0; i < data->info->pages; i++) {
                _pmbus_get_flags(data, i, &status, &event, true);
@@ -3471,7 +3464,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(pmbus_debugfs_ops_status, pmbus_debugfs_get_status,
                         NULL, "0x%04llx\n");
 
 static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
-                                      size_t count, loff_t *ppos)
+                                     size_t count, loff_t *ppos)
 {
        int rc;
        struct pmbus_debugfs_entry *entry = file->private_data;
@@ -3799,8 +3792,8 @@ int pmbus_do_probe(struct i2c_client *client, struct pmbus_driver_info *info)
 
        data->groups[0] = &data->group;
        memcpy(data->groups + 1, info->groups, sizeof(void *) * groups_num);
-       data->hwmon_dev = devm_hwmon_device_register_with_groups(dev,
-                                       name, data, data->groups);
+       data->hwmon_dev = devm_hwmon_device_register_with_groups(dev, name,
+                                                                data, data->groups);
        if (IS_ERR(data->hwmon_dev)) {
                dev_err(dev, "Failed to register hwmon device\n");
                return PTR_ERR(data->hwmon_dev);