From patchwork Sat Apr 23 23:34:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 8919231 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2A760BF29F for ; Sat, 23 Apr 2016 23:37:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3747220219 for ; Sat, 23 Apr 2016 23:37:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D21A201FA for ; Sat, 23 Apr 2016 23:37:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751923AbcDWXhE (ORCPT ); Sat, 23 Apr 2016 19:37:04 -0400 Received: from mail-pf0-f173.google.com ([209.85.192.173]:36862 "EHLO mail-pf0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752539AbcDWXet (ORCPT ); Sat, 23 Apr 2016 19:34:49 -0400 Received: by mail-pf0-f173.google.com with SMTP id c189so8622328pfb.3; Sat, 23 Apr 2016 16:34:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zL5EOEl9J57C6Vo3JKXZLf1YjN86cx/x1A/f4HgkEMY=; b=Na8EJDfRX8vpwIjjzVwLRutdJi7lmFnTe87ryxG0rg44utZsaU2aShN8Mte8vwqVZK lgBzNoWDvAaNsB6/TtGrWJLdQgDxnWMEXFi0WsSoKeec6/cfO0B4Gsk1rX6yXwNDseqd /dAwueeU9rorgV9JsDsZKzefNgLrKkr2quz70ajKSKr76tMpspdHqOSEljEh9QwLuQtv gmlDgxT9XxwskJ9jOA3RMJYBfLGr0ds1T/1iZ4OJhWUiXB54qDTiNhbSaj7XybmzW+Ig NSKfd5LPenW6ZVLvvUn40MN+k2O7gZ8VK2Irv/VIVYdVGTNgFI/XL9KhcgTXr4gwyVs+ eidQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zL5EOEl9J57C6Vo3JKXZLf1YjN86cx/x1A/f4HgkEMY=; b=laz3d7ctZeOqNh7hwGVNcoMeN/3aRgxc0J1efxwncU1gq3jbYOXcH10dE3eSuRoHHv Hs2KpZqUBGk0hcVzX5pZwLm8uJA0SBHWV+FEqNeIlNSVnyIuuWiz+TvQX6fJxHR9JOdu NyzaGsDppgm5+y3Faip5gT8xDmRgNT/a3An0uwXI0WHymKgVYWiEUqGjjrMMw8JnhwpX hvulsaRC9b6mXg9CJYBawgl5vDSBxRJEnJPwxdaNzrqLo5Padhei4B+59tYU9sxa6vzI GAwxTcvLcLDAzcQDtxJl9rUpzTSNTJXb5siQkoU5kuGt5pQceq6pJz4I4mtsKMLEobfr XdKw== X-Gm-Message-State: AOPr4FUynu8qZufoagxq9OgBsTNjor6cIuqYofJL+UvzmFw2Ij+DvS6YoEukd2INVDccbQ== X-Received: by 10.98.27.129 with SMTP id b123mr35832588pfb.111.1461454488834; Sat, 23 Apr 2016 16:34:48 -0700 (PDT) Received: from localhost ([2601:647:4203:c8e0:7256:81ff:febd:926d]) by smtp.gmail.com with ESMTPSA id b140sm17654255pfb.19.2016.04.23.16.34.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Apr 2016 16:34:48 -0700 (PDT) From: Eduardo Valentin To: Rui Zhang Cc: Linux PM , LKML , Eduardo Valentin Subject: [RFC PATCH 03/11] thermal: group device_create_file() calls that are always created Date: Sat, 23 Apr 2016 16:34:22 -0700 Message-Id: <1461454470-27714-4-git-send-email-edubezval@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1461454470-27714-1-git-send-email-edubezval@gmail.com> References: <1461454470-27714-1-git-send-email-edubezval@gmail.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 e28d547..2227264 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);