Commit 18d8f558 authored by Zhang Rui's avatar Zhang Rui Committed by Guenter Roeck
Browse files

hwmon: (coretemp) Replace sensor_device_attribute with device_attribute 



Replace sensor_device_attribute with device_attribute because
sensor_device_attribute->index is no longer used.

No functional change.

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


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

drivers/hwmon/coretemp.c

+12 −16
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ struct temp_data { 
	u32 status_reg;

	int attr_size;

	bool is_pkg_data;

	struct sensor_device_attribute sd_attrs[TOTAL_ATTRS];

	struct device_attribute sd_attrs[TOTAL_ATTRS];

	char attr_name[TOTAL_ATTRS][CORETEMP_NAME_LENGTH];

	struct attribute *attrs[TOTAL_ATTRS + 1];

	struct attribute_group attr_group;
@@ -340,9 +340,8 @@ static struct platform_device **zone_devices; 
static ssize_t show_label(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 = container_of(attr, struct temp_data, sd_attrs[ATTR_LABEL]);

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



	if (tdata->is_pkg_data)

		return sprintf(buf, "Package id %u\n", pdata->pkg_id);
@@ -354,8 +353,8 @@ static ssize_t show_crit_alarm(struct device *dev, 
				struct device_attribute *devattr, char *buf)

{

	u32 eax, edx;

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

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

	struct temp_data *tdata = container_of(devattr, struct temp_data,

						sd_attrs[ATTR_CRIT_ALARM]);



	mutex_lock(&tdata->update_lock);

	rdmsr_on_cpu(tdata->cpu, tdata->status_reg, &eax, &edx);
@@ -367,8 +366,7 @@ static ssize_t show_crit_alarm(struct device *dev, 
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 temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_TJMAX]);

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

	int tjmax;



	mutex_lock(&tdata->update_lock);
@@ -381,8 +379,7 @@ static ssize_t show_tjmax(struct device *dev, 
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 temp_data *tdata = container_of(attr, struct temp_data, sd_attrs[ATTR_TTARGET]);

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

	int ttarget;



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

{

	u32 eax, edx;

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

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

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

	int tjmax;



	mutex_lock(&tdata->update_lock);
@@ -443,11 +439,11 @@ static int create_core_attrs(struct temp_data *tdata, struct device *dev) 


		snprintf(tdata->attr_name[i], CORETEMP_NAME_LENGTH,

			 "temp%d_%s", attr_no, suffixes[i]);

		sysfs_attr_init(&tdata->sd_attrs[i].dev_attr.attr);

		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->attrs[i] = &tdata->sd_attrs[i].dev_attr.attr;

		sysfs_attr_init(&tdata->sd_attrs[i].attr);

		tdata->sd_attrs[i].attr.name = tdata->attr_name[i];

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

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

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

	}

	tdata->attr_group.attrs = tdata->attrs;

	return sysfs_create_group(&dev->kobj, &tdata->attr_group);