From patchwork Fri Apr 26 10:37:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kachhap X-Patchwork-Id: 2492481 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 545773FC64 for ; Fri, 26 Apr 2013 10:42:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760062Ab3DZKjH (ORCPT ); Fri, 26 Apr 2013 06:39:07 -0400 Received: from mail-pb0-f48.google.com ([209.85.160.48]:57876 "EHLO mail-pb0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760054Ab3DZKjD (ORCPT ); Fri, 26 Apr 2013 06:39:03 -0400 Received: by mail-pb0-f48.google.com with SMTP id wy7so68801pbc.21 for ; Fri, 26 Apr 2013 03:39:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=lkrhUBmOJvrQLZk0+MSJFvwJwKphYuXyhSeT3ijkFV4=; b=uV3wTjUXE+dFVZey8XRpjPAWcE4y15q97g6vTkxBdA+iI0kcm2kOnZayYnwzZa8hTc M6q10GPLmdfb2iN4mzqokXzT9h5XCkHedW5DeC3bWU1t/+RHAat26zua2XNJljsZSWpf fBX1rqYxbGfw613WG+dVG2FIYxbSkNXaJrifPBrakF6g545q+sQ/VXgMNV66D9dEFC2X ah18sNxvPiZUjUzqHfgi4Elf8thQv5NCRY/47NqLx+6dA3w571CD8emAUnP7nzzqjekT 9SAb8E3uw7KLYPjDcI+OV3NtKKj0UGKWEW5TT2eH34S1DlGCEpJI17sp3tGXLjvL7AbE joig== X-Received: by 10.66.100.196 with SMTP id fa4mr33828954pab.140.1366972740940; Fri, 26 Apr 2013 03:39:00 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPSA id at4sm11172333pbc.40.2013.04.26.03.38.56 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 26 Apr 2013 03:38:59 -0700 (PDT) From: Amit Daniel Kachhap To: linux-pm@vger.kernel.org Cc: Zhang Rui , linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, amit.kachhap@gmail.com, Kukjin Kim , Eduardo Valentin Subject: [PATCH V2 12/20] thermal: exynos: Modify private_data to appropriate name driver_data Date: Fri, 26 Apr 2013 16:07:43 +0530 Message-Id: <1366972671-9227-13-git-send-email-amit.daniel@samsung.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1366972671-9227-1-git-send-email-amit.daniel@samsung.com> References: <1366972671-9227-1-git-send-email-amit.daniel@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org This patch renames member private_data to driver_data of the thermal zone registration structure as this item stores the driver related data and uses it to call the driver related callbacks. Acked-by: Kukjin Kim Signed-off-by: Amit Daniel Kachhap --- drivers/thermal/samsung/exynos_thermal_common.c | 4 ++-- drivers/thermal/samsung/exynos_thermal_common.h | 2 +- drivers/thermal/samsung/exynos_tmu.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/thermal/samsung/exynos_thermal_common.c b/drivers/thermal/samsung/exynos_thermal_common.c index d4cd5ec..c0e4bdb 100644 --- a/drivers/thermal/samsung/exynos_thermal_common.c +++ b/drivers/thermal/samsung/exynos_thermal_common.c @@ -226,7 +226,7 @@ static int exynos_get_temp(struct thermal_zone_device *thermal, pr_info("Temperature sensor not initialised\n"); return -EINVAL; } - data = th_zone->sensor_conf->private_data; + data = th_zone->sensor_conf->driver_data; *temp = th_zone->sensor_conf->read_temperature(data); /* convert the temperature into millicelsius */ *temp = *temp * MCELSIUS; @@ -245,7 +245,7 @@ static int exynos_set_emul_temp(struct thermal_zone_device *thermal, pr_info("Temperature sensor not initialised\n"); return -EINVAL; } - data = th_zone->sensor_conf->private_data; + data = th_zone->sensor_conf->driver_data; if (th_zone->sensor_conf->write_emul_temp) ret = th_zone->sensor_conf->write_emul_temp(data, temp); return ret; diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/drivers/thermal/samsung/exynos_thermal_common.h index 26fdf8d..878120b 100644 --- a/drivers/thermal/samsung/exynos_thermal_common.h +++ b/drivers/thermal/samsung/exynos_thermal_common.h @@ -76,7 +76,7 @@ struct thermal_sensor_conf { int (*write_emul_temp)(void *drv_data, unsigned long temp); struct thermal_trip_point_conf trip_data; struct thermal_cooling_conf cooling_data; - void *private_data; + void *driver_data; void *pzone_data; }; diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 133d3f5..bdf40ef 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -482,7 +482,7 @@ static int exynos_tmu_probe(struct platform_device *pdev) exynos_tmu_control(pdev, true); /* Register the sensor with thermal management interface */ - (&exynos_sensor_conf)->private_data = data; + (&exynos_sensor_conf)->driver_data = data; exynos_sensor_conf.trip_data.trip_count = pdata->trigger_enable[0] + pdata->trigger_enable[1] + pdata->trigger_enable[2]+ pdata->trigger_enable[3];