From patchwork Wed Aug 30 08:47:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 111286 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp595332qge; Wed, 30 Aug 2017 01:49:10 -0700 (PDT) X-Received: by 10.84.231.199 with SMTP id g7mr1117878pln.104.1504082950872; Wed, 30 Aug 2017 01:49:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504082950; cv=none; d=google.com; s=arc-20160816; b=KPrOcPjQGDesBqKnl1GVMeQsX49fLhAA2fJtNspeEJQQmoLRQOmdpGXyAjTZY/XVyv sLOQgcwWxK0J7aVP+0Vlb82NnN9Zp9PmKpHp83BgPZ8ouEUuXI+XyudqFFYOU+Sm/MRb Qer+V4xjpgtiTnsq7/PIE8QUoLoZXHgG17YQ0e47OTC9cecq+UkKsUZ6EqVzN8ozTUwh iBNT9Cse4RuK2S15EWVBwZDFBCNg9tYiTsNn30pWcpYwMow8ly+DahgWI3+JMFRH8EYf zVIyyvNJ7DqZZJsJbgmDISWBfdiwsA/Fvxw4kkZmWP5bqD9o1F4jTFUAbreQBCTHq8uA Cn9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=m87CszR4V4jz5bAZloLpCirPsN4I4nvqmJFsduiPhoc=; b=cd+VsLIHVn3KKqmiLl2xJx5J9DesH1E5mfjhnyDSheWPMxapqDVWGZAZiPiV2WsNkC tK/1JKO9bVNJ2vf7kLVMWv2dQfGn9YpIWzinOyf6zog1BM+J/iWj3IIMhiZ+uhY7ydxo N8/TJlNG3C3nu+dKryJwNSzo+pSSJRKFpxjdAfPHut6XvICV4FSsXzKBBBJIg3gRVHU2 dmmhe603ir5aDXp4CqrmCS8n5VKbmWbP78WzebGQmC5tLJ8QDTLd2qevaN2yYD3P1HMk pG77aD6WQl+RcD/OOSohFWDhP8ROe7NsOYEmbN2+hQ9lSjTOYken8PsBmRaZNYc6+WC6 efZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EzoUug7p; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 3si1242588pfg.575.2017.08.30.01.49.10; Wed, 30 Aug 2017 01:49:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EzoUug7p; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751724AbdH3ItH (ORCPT + 26 others); Wed, 30 Aug 2017 04:49:07 -0400 Received: from mail-wr0-f182.google.com ([209.85.128.182]:38406 "EHLO mail-wr0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751667AbdH3ItD (ORCPT ); Wed, 30 Aug 2017 04:49:03 -0400 Received: by mail-wr0-f182.google.com with SMTP id 40so15985268wrv.5 for ; Wed, 30 Aug 2017 01:49:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=m87CszR4V4jz5bAZloLpCirPsN4I4nvqmJFsduiPhoc=; b=EzoUug7pH8lQFHDD0ry/zETPytTp+xzKMJc3A2x1K9k+1AbXsyz48KjAoZHNwSi/4+ r+Nfy04brZG4Eem/RSN6Gv6Ebyx5PV4cxmMVqiKimZHocMvIWns2OAVP7Oz1CMfxSbFj MHoYPAthjQJXvvm6vofd8U6zDSShhHm8uC8e8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=m87CszR4V4jz5bAZloLpCirPsN4I4nvqmJFsduiPhoc=; b=K71MtxuBr4un+10lLFkA2tsQf/2fbbNSpYlxLZpaQCXB44yOlSB5ErDB9EhIIMrgpt a4o31k/ovG/r+78TRLH/o/ZtWon7clIRD4ToYvZxxs3af4dKNjfCEDjHnVgf/h9w0g5L ewqd8sdugFhCPtbO1usmUhwkgQGjLt0PU7blf0WiTo2edfRyLyMvMluPweNnRkQtRd5O Hbx0DDQAT5X/+iq4geq5LDS7xidqzdxSc/pEHvJxfDdFscycYQf5J52yflqHsnIaFIui NFXkiuWJazfOc1nGr2pV3KyPGvQAxFW1ZO8xtDQjzT5c3Xd3vVDoNUykocif9dI0laGq YSSQ== X-Gm-Message-State: AHYfb5hVwpK4BcAjb4RYrGH4sw1+r6ObC7wUiQ8dFgtvkg39HvD2ZSZ7 1ws11k2rytTsr4Ns X-Received: by 10.223.143.3 with SMTP id p3mr389514wrb.255.1504082941836; Wed, 30 Aug 2017 01:49:01 -0700 (PDT) Received: from localhost.localdomain ([2a01:e35:879a:6cd0:b0b0:ba2b:b9fd:8a33]) by smtp.gmail.com with ESMTPSA id q24sm4032811wrc.26.2017.08.30.01.49.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Aug 2017 01:49:01 -0700 (PDT) From: Daniel Lezcano To: rui.zhang@intel.com, edubezval@gmail.com Cc: daniel.lezcano@linaro.org, linux-pm@vger.kernel.org, kevin.wangtao@linaro.org, leo.yan@linaro.org, linux-kernel@vger.kernel.org (open list) Subject: [PATCH 12/13] thermal/drivers/hisi: Remove thermal data back pointer Date: Wed, 30 Aug 2017 10:47:36 +0200 Message-Id: <1504082857-21702-12-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504082857-21702-1-git-send-email-daniel.lezcano@linaro.org> References: <1504082857-21702-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The presence of the thermal data pointer in the sensor structure has the unique purpose of accessing the thermal data in the interrupt handler. The sensor pointer is passed when registering the interrupt handler, replace the cookie by the thermal data pointer, so the back pointer is no longer needed. Signed-off-by: Daniel Lezcano --- drivers/thermal/hisi_thermal.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index 9eee82b..b1b086ab 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -45,7 +45,6 @@ #define HISI_DEFAULT_SENSOR 2 struct hisi_thermal_sensor { - struct hisi_thermal_data *thermal; struct thermal_zone_device *tzd; uint32_t id; uint32_t thres_temp; @@ -207,10 +206,10 @@ static void hisi_thermal_disable_sensor(struct hisi_thermal_data *data) mutex_unlock(&data->thermal_lock); } -static int hisi_thermal_get_temp(void *_sensor, int *temp) +static int hisi_thermal_get_temp(void *__data, int *temp) { - struct hisi_thermal_sensor *sensor = _sensor; - struct hisi_thermal_data *data = sensor->thermal; + struct hisi_thermal_data *data = __data; + struct hisi_thermal_sensor *sensor = &data->sensor; *temp = hisi_thermal_get_temperature(data->regs); @@ -258,10 +257,10 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev, const struct thermal_trip *trip; sensor->id = index; - sensor->thermal = data; sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, - sensor->id, sensor, &hisi_of_thermal_ops); + sensor->id, data, + &hisi_of_thermal_ops); if (IS_ERR(sensor->tzd)) { ret = PTR_ERR(sensor->tzd); sensor->tzd = NULL;