diff options
| author | Eduardo Valentin <edubezval@gmail.com> | 2016-11-08 06:08:41 +0100 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2016-11-23 03:06:12 +0100 |
| commit | 308f726ac872bee72ab0fccb0ef6a75364e47496 (patch) | |
| tree | be3f0dd9426de79b4399fe9b660e014e985724fd /drivers/thermal | |
| parent | thermal: core: group thermal_zone DEVICE_ATTR's declarations (diff) | |
| download | linux-308f726ac872bee72ab0fccb0ef6a75364e47496.tar.xz linux-308f726ac872bee72ab0fccb0ef6a75364e47496.zip | |
thermal: core: group device_create_file() calls that are always created
Simple code reorganization to group files that are always created
when registering a thermal zone.
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/thermal_core.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 97f314e39b3d..3d43c297948a 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1921,14 +1921,6 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, } /* sys I/F */ - result = device_create_file(&tz->device, &dev_attr_type); - if (result) - goto unregister; - - result = device_create_file(&tz->device, &dev_attr_temp); - if (result) - goto unregister; - if (ops->get_mode) { result = device_create_file(&tz->device, &dev_attr_mode); if (result) @@ -1963,13 +1955,16 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, goto unregister; } - /* Create policy attribute */ - result = device_create_file(&tz->device, &dev_attr_policy); + result = device_create_file(&tz->device, &dev_attr_type); if (result) goto unregister; - /* Add thermal zone params */ - result = create_tzp_attrs(&tz->device); + result = device_create_file(&tz->device, &dev_attr_temp); + if (result) + goto unregister; + + /* Create policy attribute */ + result = device_create_file(&tz->device, &dev_attr_policy); if (result) goto unregister; @@ -1978,6 +1973,11 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, if (result) goto unregister; + /* Add thermal zone params */ + result = create_tzp_attrs(&tz->device); + if (result) + goto unregister; + /* Update 'this' zone's governor information */ mutex_lock(&thermal_governor_lock); |