From patchwork Mon Apr 8 16:07:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Valentin X-Patchwork-Id: 2409671 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 6A5DE3FC71 for ; Mon, 8 Apr 2013 16:13:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934461Ab3DHQJ0 (ORCPT ); Mon, 8 Apr 2013 12:09:26 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:50569 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934071Ab3DHQJY (ORCPT ); Mon, 8 Apr 2013 12:09:24 -0400 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id r38G9NTi016445; Mon, 8 Apr 2013 11:09:23 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r38G9MOT011891; Mon, 8 Apr 2013 11:09:22 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.2.342.3; Mon, 8 Apr 2013 11:09:22 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id r38G9Moc005367; Mon, 8 Apr 2013 11:09:22 -0500 Received: from localhost (h68-18.vpn.ti.com [172.24.68.18]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id r38G9KV03331; Mon, 8 Apr 2013 11:09:20 -0500 (CDT) From: Eduardo Valentin To: CC: , , Eduardo Valentin Subject: [PATCH RESEND 04/11] thermal: rename get_thermal_instance to thermal_instance_get Date: Mon, 8 Apr 2013 12:07:31 -0400 Message-ID: <1365437258-31412-5-git-send-email-eduardo.valentin@ti.com> X-Mailer: git-send-email 1.7.7.1.488.ge8e1c In-Reply-To: <1365437258-31412-1-git-send-email-eduardo.valentin@ti.com> References: <1365437258-31412-1-git-send-email-eduardo.valentin@ti.com> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org To follow the prefix names used by the thermal exported functions, this patch renames get_thermal_instance to thermal_instance_get. Signed-off-by: Eduardo Valentin --- Documentation/thermal/sysfs-api.txt | 2 +- drivers/thermal/fair_share.c | 2 +- drivers/thermal/thermal_sys.c | 4 ++-- include/linux/thermal.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/thermal/sysfs-api.txt b/Documentation/thermal/sysfs-api.txt index 4b23190..059b3bf 100644 --- a/Documentation/thermal/sysfs-api.txt +++ b/Documentation/thermal/sysfs-api.txt @@ -358,7 +358,7 @@ are supposed to implement the callback. If they don't, the thermal framework calculated the trend by comparing the previous and the current temperature values. -5.2:get_thermal_instance: +5.2:thermal_instance_get: This function returns the thermal_instance corresponding to a given {thermal_zone, cooling_device, trip_point} combination. Returns NULL if such an instance does not exist. diff --git a/drivers/thermal/fair_share.c b/drivers/thermal/fair_share.c index 792479f..f629446 100644 --- a/drivers/thermal/fair_share.c +++ b/drivers/thermal/fair_share.c @@ -95,7 +95,7 @@ static int fair_share_throttle(struct thermal_zone_device *tz, int trip) continue; cdev = tzp->tbp[i].cdev; - instance = get_thermal_instance(tz, cdev, trip); + instance = thermal_instance_get(tz, cdev, trip); if (!instance) continue; diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index ffaf6d3..44e89c0 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -170,7 +170,7 @@ int get_tz_trend(struct thermal_zone_device *tz, int trip) } EXPORT_SYMBOL(get_tz_trend); -struct thermal_instance *get_thermal_instance(struct thermal_zone_device *tz, +struct thermal_instance *thermal_instance_get(struct thermal_zone_device *tz, struct thermal_cooling_device *cdev, int trip) { struct thermal_instance *pos = NULL; @@ -191,7 +191,7 @@ struct thermal_instance *get_thermal_instance(struct thermal_zone_device *tz, return target_instance; } -EXPORT_SYMBOL(get_thermal_instance); +EXPORT_SYMBOL(thermal_instance_get); static void print_bind_err_msg(struct thermal_zone_device *tz, struct thermal_cooling_device *cdev, int ret) diff --git a/include/linux/thermal.h b/include/linux/thermal.h index e8ec9d8..e2a49e1 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -239,7 +239,7 @@ struct thermal_cooling_device *thermal_cooling_device_register(char *, void *, void thermal_cooling_device_unregister(struct thermal_cooling_device *); int get_tz_trend(struct thermal_zone_device *, int); -struct thermal_instance *get_thermal_instance(struct thermal_zone_device *, +struct thermal_instance *thermal_instance_get(struct thermal_zone_device *, struct thermal_cooling_device *, int); void thermal_cdev_update(struct thermal_cooling_device *); void thermal_notify_framework(struct thermal_zone_device *, int);