Commit 649b419f authored by Guenter Roeck's avatar Guenter Roeck
Browse files

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: default avatarTzung-Bi Shih <tzungbi@kernel.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent e6b082d7
Loading
Loading
Loading
Loading
+17 −24
Original line number Diff line number Diff line
@@ -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,12 +191,11 @@ 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)
{
@@ -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;

@@ -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;
}

@@ -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);
@@ -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);