diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-30 17:43:31 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:30:27 -0400 |
commit | 0e968a3b6da710294a56460473cac32dc821fd4a (patch) | |
tree | afdbc0f099ac755b6af037c201f262ac231ce089 /drivers | |
parent | 78c55d76b84628862079351f77aa0f4aa3b65f58 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/thermal/thermal_sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 5e38ba10a3a9..0a69672097a8 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c | |||
@@ -417,7 +417,7 @@ static LIST_HEAD(thermal_hwmon_list); | |||
417 | static ssize_t | 417 | static ssize_t |
418 | name_show(struct device *dev, struct device_attribute *attr, char *buf) | 418 | name_show(struct device *dev, struct device_attribute *attr, char *buf) |
419 | { | 419 | { |
420 | struct thermal_hwmon_device *hwmon = dev->driver_data; | 420 | struct thermal_hwmon_device *hwmon = dev_get_drvdata(dev); |
421 | return sprintf(buf, "%s\n", hwmon->type); | 421 | return sprintf(buf, "%s\n", hwmon->type); |
422 | } | 422 | } |
423 | static DEVICE_ATTR(name, 0444, name_show, NULL); | 423 | static DEVICE_ATTR(name, 0444, name_show, NULL); |
@@ -488,7 +488,7 @@ thermal_add_hwmon_sysfs(struct thermal_zone_device *tz) | |||
488 | result = PTR_ERR(hwmon->device); | 488 | result = PTR_ERR(hwmon->device); |
489 | goto free_mem; | 489 | goto free_mem; |
490 | } | 490 | } |
491 | hwmon->device->driver_data = hwmon; | 491 | dev_set_drvdata(hwmon->device, hwmon); |
492 | result = device_create_file(hwmon->device, &dev_attr_name); | 492 | result = device_create_file(hwmon->device, &dev_attr_name); |
493 | if (result) | 493 | if (result) |
494 | goto unregister_hwmon_device; | 494 | goto unregister_hwmon_device; |