projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[deliverable/linux.git]
/
drivers
/
thermal
/
thermal_sys.c
diff --git
a/drivers/thermal/thermal_sys.c
b/drivers/thermal/thermal_sys.c
index 5e38ba10a3a90ed2a35687c4e73d636e1626a817..0a69672097a8195e3671e1d63b164c19fa0ababc 100644
(file)
--- a/
drivers/thermal/thermal_sys.c
+++ b/
drivers/thermal/thermal_sys.c
@@
-417,7
+417,7
@@
static LIST_HEAD(thermal_hwmon_list);
static ssize_t
name_show(struct device *dev, struct device_attribute *attr, char *buf)
{
static ssize_t
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);
}
static DEVICE_ATTR(name, 0444, name_show, NULL);
return sprintf(buf, "%s\n", hwmon->type);
}
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);
goto free_mem;
}
result = PTR_ERR(hwmon->device);
goto free_mem;
}
-
hwmon->device->driver_data = hwmon
;
+
dev_set_drvdata(hwmon->device, hwmon)
;
result = device_create_file(hwmon->device, &dev_attr_name);
if (result)
goto unregister_hwmon_device;
result = device_create_file(hwmon->device, &dev_attr_name);
if (result)
goto unregister_hwmon_device;
This page took
0.023918 seconds
and
5
git commands to generate.