From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755751AbcEaGi6 (ORCPT ); Tue, 31 May 2016 02:38:58 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:36138 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755331AbcEaGTF (ORCPT ); Tue, 31 May 2016 02:19:05 -0400 From: Eduardo Valentin To: Rui Zhang Cc: Linux PM , LKML , Keerthy , Eduardo Valentin Subject: [PATCHv4 03/48] thermal: core: group device_create_file() calls that are always created Date: Mon, 30 May 2016 23:18:10 -0700 Message-Id: <1464675535-2433-4-git-send-email-edubezval@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1464675535-2433-1-git-send-email-edubezval@gmail.com> References: <1464675535-2433-1-git-send-email-edubezval@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simple code reorganization to group files that are always created when registering a thermal zone. Cc: Zhang Rui Cc: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Eduardo Valentin --- drivers/thermal/thermal_core.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 956e7e1..3ce7882 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1858,14 +1858,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) @@ -1900,13 +1892,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; @@ -1915,6 +1910,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); -- 2.1.4