thermal: remove driver_data direct access of struct device
In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
@@ -417,7 +417,7 @@ static LIST_HEAD(thermal_hwmon_list);
|
|||||||
static ssize_t
|
static ssize_t
|
||||||
name_show(struct device *dev, struct device_attribute *attr, char *buf)
|
name_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||||
{
|
{
|
||||||
struct thermal_hwmon_device *hwmon = dev->driver_data;
|
struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev);
|
||||||
return sprintf(buf, "%s\n", hwmon->type);
|
return sprintf(buf, "%s\n", hwmon->type);
|
||||||
}
|
}
|
||||||
static DEVICE_ATTR(name, 0444, name_show, NULL);
|
static DEVICE_ATTR(name, 0444, name_show, NULL);
|
||||||
@@ -488,7 +488,7 @@ thermal_add_hwmon_sysfs(struct thermal_zone_device *tz)
|
|||||||
result = PTR_ERR(hwmon->device);
|
result = PTR_ERR(hwmon->device);
|
||||||
goto free_mem;
|
goto free_mem;
|
||||||
}
|
}
|
||||||
hwmon->device->driver_data = hwmon;
|
dev_set_drvdata(hwmon->device, hwmon);
|
||||||
result = device_create_file(hwmon->device, &dev_attr_name);
|
result = device_create_file(hwmon->device, &dev_attr_name);
|
||||||
if (result)
|
if (result)
|
||||||
goto unregister_hwmon_device;
|
goto unregister_hwmon_device;
|
||||||
|
Reference in New Issue
Block a user