Commit 25f8e01b authored by Zhang Rui's avatar Zhang Rui Committed by Guenter Roeck
Browse files

hwmon: (coretemp) Remove unnecessary dependency of array index 



When sensor_device_attribute pointer is available, use container_of() to
get the temp_data address.

This removes the unnecessary dependency of cached index in
pdata->core_data[].

No functional change.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Link: https://lore.kernel.org/r/20240202092144.71180-6-rui.zhang@intel.com


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent c8c20740

drivers/hwmon/coretemp.c

+7 −13
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ static ssize_t show_label(struct device *dev, 
{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct platform_data *pdata = dev_get_drvdata(dev);

	struct temp_data *tdata = pdata->core_data[attr->index];

	struct temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_LABEL]);



	if (tdata->is_pkg_data)

		return sprintf(buf, "Package id %u\n", pdata->pkg_id);
@@ -355,8 +355,7 @@ static ssize_t show_crit_alarm(struct device *dev, 
{

	u32 eax, edx;

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct platform_data *pdata = dev_get_drvdata(dev);

	struct temp_data *tdata = pdata->core_data[attr->index];

	struct temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_CRIT_ALARM]);



	mutex_lock(&tdata->update_lock);

	rdmsr_on_cpu(tdata->cpu, tdata->status_reg, &eax, &edx);
@@ -369,8 +368,7 @@ static ssize_t show_tjmax(struct device *dev, 
			struct device_attribute *devattr, char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct platform_data *pdata = dev_get_drvdata(dev);

	struct temp_data *tdata = pdata->core_data[attr->index];

	struct temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_TJMAX]);

	int tjmax;



	mutex_lock(&tdata->update_lock);
@@ -384,8 +382,7 @@ static ssize_t show_ttarget(struct device *dev, 
				struct device_attribute *devattr, char *buf)

{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct platform_data *pdata = dev_get_drvdata(dev);

	struct temp_data *tdata = pdata->core_data[attr->index];

	struct temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_TTARGET]);

	int ttarget;



	mutex_lock(&tdata->update_lock);
@@ -402,8 +399,7 @@ static ssize_t show_temp(struct device *dev, 
{

	u32 eax, edx;

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct platform_data *pdata = dev_get_drvdata(dev);

	struct temp_data *tdata = pdata->core_data[attr->index];

	struct temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_TEMP]);

	int tjmax;



	mutex_lock(&tdata->update_lock);
@@ -426,8 +422,7 @@ static ssize_t show_temp(struct device *dev, 
	return sprintf(buf, "%d\n", tdata->temp);

}



static int create_core_attrs(struct temp_data *tdata, struct device *dev,

			     int index)

static int create_core_attrs(struct temp_data *tdata, struct device *dev)

{

	int i;

	static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev,
@@ -452,7 +447,6 @@ static int create_core_attrs(struct temp_data *tdata, struct device *dev, 
		tdata->sd_attrs[i].dev_attr.attr.name = tdata->attr_name[i];

		tdata->sd_attrs[i].dev_attr.attr.mode = 0444;

		tdata->sd_attrs[i].dev_attr.show = rd_ptr[i];

		tdata->sd_attrs[i].index = index;

		tdata->attrs[i] = &tdata->sd_attrs[i].dev_attr.attr;

	}

	tdata->attr_group.attrs = tdata->attrs;
@@ -557,7 +551,7 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu, 
	pdata->core_data[index] = tdata;



	/* Create sysfs interfaces */

	err = create_core_attrs(tdata, pdata->hwmon_dev, index);

	err = create_core_attrs(tdata, pdata->hwmon_dev);

	if (err)

		goto exit_free;