From patchwork Sat Apr 23 23:34:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 8919101 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 199749F441 for ; Sat, 23 Apr 2016 23:35:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3E05F201FA for ; Sat, 23 Apr 2016 23:35:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 41D5120219 for ; Sat, 23 Apr 2016 23:35:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752737AbcDWXfZ (ORCPT ); Sat, 23 Apr 2016 19:35:25 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:34122 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752655AbcDWXfF (ORCPT ); Sat, 23 Apr 2016 19:35:05 -0400 Received: by mail-pf0-f171.google.com with SMTP id y69so33675619pfb.1; Sat, 23 Apr 2016 16:34:59 -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=DZOZ8OYF6VTLdBeKkjf9CLlUE662HBbfucKMbRm4F9U=; b=wFy2i8w43wrzJsfAI2UnHKtBR98fF65ALp2posL4mH+H5dWEmwWfb7aci7XfisYxEV MinXGEKgjG0KC/s8wErvElcwZrsE/6uB7cciGk3Y+yOah8xHl1TB7NFNWLLY/ZKIoUpq NBUt8gwWXpDL8zGpvf2gpvREKIYATmj+JKa5nToPI3akPdA0Sp3sps9Ikc5NG7glNZBm RITziPwLGBQXYeHLIczfpy0RjIt7/6jM/IWHK9QWjeafE0ERElyiXrkCkvcwzAvVHPVK PC6blPotTWfkUr75+J+biiLxlJhKRDRq0fQKH14zTAHU1e3DDhNcqTfQemScp99vP55I BIkA== 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=DZOZ8OYF6VTLdBeKkjf9CLlUE662HBbfucKMbRm4F9U=; b=mBsVeDUBpcO0WPmtB08ea/moq4wugSJolz9E8t/ffpcUxR6YrAwaG877iM4PnFzfq6 V9cSctlieQOQU/wEosy0V4hIjOpiOqXRGSW/YAsKcfEyM5msD7y7QDftXTsp/HO5C752 k9EhKTD1ktSDgQ8FVu6ruv+wuhsAdt1jWFz4PHuEXEjQLQweuLHI6DaF+Ao6evY3yNBC YtA1ybtp85JP+BePPEgWTw9lTIUIh+Zr4JucdvlOLU9LdeyGZ7yKnuqlJPHwSfgq3clB zHlK9ZVSBTA0FkMigG+e/j/o4ZHDdiuSMC5XWoZQ2N2cQj9vcdRZ8JMI3LA9xSCo+BeX sW2A== X-Gm-Message-State: AOPr4FXbdbawZxKStil9979Soeimsjd5qB09u1eziklYkQl9XiCkdk0dW3jlUUwrh3Xwjg== X-Received: by 10.98.92.71 with SMTP id q68mr38779940pfb.70.1461454499428; Sat, 23 Apr 2016 16:34:59 -0700 (PDT) Received: from localhost ([2601:647:4203:c8e0:7256:81ff:febd:926d]) by smtp.gmail.com with ESMTPSA id ba9sm18813504pab.24.2016.04.23.16.34.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Apr 2016 16:34:58 -0700 (PDT) From: Eduardo Valentin To: Rui Zhang Cc: Linux PM , LKML , Eduardo Valentin Subject: [RFC PATCH 10/11] thermal: create tz->device.groups dynamically Date: Sat, 23 Apr 2016 16:34:29 -0700 Message-Id: <1461454470-27714-11-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=unavailable 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 This is a patch to allow adding groups created dynamically. For now we create only the existing group. However, this is a preparation to allow creating trip groups, which are determined only when the number of trips are known at runtime. 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 | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index b1b2945..13a85d7 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1169,7 +1169,7 @@ static const struct attribute_group *thermal_zone_attribute_groups[] = { &thermal_zone_attribute_group, &thermal_zone_mode_attribute_group, &thermal_zone_passive_attribute_group, - NULL + /* This is not NULL terminated as we create the group dynamically */ }; /** @@ -1281,6 +1281,25 @@ static void remove_trip_attrs(struct thermal_zone_device *tz) kfree(tz->trip_hyst_attrs); } +static int thermal_zone_create_device_groups(struct thermal_zone_device *tz) +{ + const struct attribute_group **groups; + int i, size; + + size = ARRAY_SIZE(thermal_zone_attribute_groups) + 1; + /* This also takes care of API requirement to be NULL terminated */ + groups = kzalloc(size * sizeof(*groups), GFP_KERNEL); + if (!groups) + return -ENOMEM; + + for (i = 0; i < size - 1; i++) + groups[i] = thermal_zone_attribute_groups[i]; + + tz->device.groups = groups; + + return 0; +} + /* sys I/F for cooling device */ #define to_cooling_device(_dev) \ container_of(_dev, struct thermal_cooling_device, device) @@ -1913,7 +1932,7 @@ struct thermal_zone_device *thermal_zone_device_register(const char *type, tz->polling_delay = polling_delay; /* Add nodes that are always present via .groups */ - tz->device.groups = thermal_zone_attribute_groups; + thermal_zone_create_device_groups(tz); /* A new thermal zone needs to be updated anyway. */ atomic_set(&tz->need_update, 1); @@ -2042,7 +2061,7 @@ void thermal_zone_device_unregister(struct thermal_zone_device *tz) idr_destroy(&tz->idr); mutex_destroy(&tz->lock); device_unregister(&tz->device); - return; + kfree(tz->device.groups); } EXPORT_SYMBOL_GPL(thermal_zone_device_unregister);