From patchwork Wed Mar 20 13:17:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 160669 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp281800jan; Wed, 20 Mar 2019 06:18:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqxPkwSjH3FJU/LqbYCUrIKrw/SWq7VB0WzhseWG6mJCYDbodcZU+dIlaL5Uii+oS9S5W8HH X-Received: by 2002:a63:1723:: with SMTP id x35mr7179447pgl.364.1553087913290; Wed, 20 Mar 2019 06:18:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553087913; cv=none; d=google.com; s=arc-20160816; b=wbX9YbD2ICqdBBd57UvC1wwz/raCzOBEyz9/pTwbAJebgVNlqNeRrPtvPactuLCfd5 2RWKaxU5YFURYCXKtNXFqFWZFCVL2nUeaDt6domPW7e8vCEPSoruhwE7/xwm4bOxElhY gy2p5N2W2Hfaq2KLCAsGOBK6RFdRAGRV1E4u58otpbYbDK1OTvbLUKZ2GNR+ods94tdm fNkHCnNqbDCS4rdcvhQt35D1wBLK5wTW2kJvPIF/C7dHTWOlTiwTD3vHHamWZb8ssIua XNDdqTm2g069bpkN9aXsokzylY/VvhstdaBFGwRSBv1N1MHpCTR4R4e94Lx5Uebo7FvC pacQ== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=zy0Ocp2xe2rob5f0FFseaWF46iQU7ldkZ5vVgEtDGww=; b=QYVh5MUMf6rs8fGK4Vl25BcPfmph3dCM54yvKpjnFgPp04MXfj5powMisCLFr97e0U +IpKTTbTNjUJrouUJu0ksN15+AQA0Q831wk4tXJTEZNoLFmzroThdPccoXr9dpnUOT12 4uopr1vAvRZBbmc6240k/xFXe2Y2cSkZm0KXwoySF6N+xToSyeE2RFIk3hWlr7kiV3hk 9MS+FlumRB7AuGeRYvJa2JgyL+yqHly0/4gUXgyqO7ZfguFWBwdFZ2hpz4T+uouUbvfN UYGde2AchNzPtjikqbFfly9j/EZeHiGP8w3k5NmH4clxQdMmERZwFRBmqak3e9q5Flrd FtqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=N3dqw6dv; 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 z8si1618921pgp.527.2019.03.20.06.18.32; Wed, 20 Mar 2019 06:18:33 -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=N3dqw6dv; 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 S1728115AbfCTNSb (ORCPT + 31 others); Wed, 20 Mar 2019 09:18:31 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:33493 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728077AbfCTNSa (ORCPT ); Wed, 20 Mar 2019 09:18:30 -0400 Received: by mail-pg1-f193.google.com with SMTP id b12so1821866pgk.0 for ; Wed, 20 Mar 2019 06:18:29 -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 :in-reply-to:references; bh=zy0Ocp2xe2rob5f0FFseaWF46iQU7ldkZ5vVgEtDGww=; b=N3dqw6dvSir0+OFpz8pTP+++GEysAzMXQHTc9vrc85ZKFxfOy1+wgeN/rPF+tvtmE/ DWsCiGg2Q1+bFUr5qP7gJcBmScObPv9ZwYLk1kSWtfYELghCJAJv7RvvOEj3tFogM9XG +LtA5BVgEYtJFuABasddQS8q8Vybzom+HxiMxxJTG+lhn0EHyEuCiw6hZg2oGJr87K4A dDQR/4Gvc5TL0VtKPG+k10gZsPbjqae8z3bAvavuoM2qxf7Z91uKl82WnDiCHg4J4GgH ZBuwjJ61jDrEvbESixDRHH6Ktzt/gaEhDx33LivKUzjsLLLIJ+C4QsjVMT76auGmQT7I qRwA== 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:in-reply-to:references; bh=zy0Ocp2xe2rob5f0FFseaWF46iQU7ldkZ5vVgEtDGww=; b=TphS+izjPaSrGq3u1KJaa9UtQMZoBdgkLExe+8CDg8CgTlTS54YkqkI7XWm3GaLjm2 zi6mafHEPs8PVY8f/nEoHvu2WPQb+QduALPgru8NRyApvMzptp3R6bHsV5nBbt+GQVzg Cqg5af/+iVYZny0PWkczjfOzeqiGYL2KpjuGdkFmDVkI+M5oElMeUBoL4WHqheEkI6S/ 3mvnWVkBUxxOoFpKsSM/i6deA3ighe+nbCJtoItYuK8Aqgd2Nmz6H60cOjQdGsq/netj hjDwoXX+FFs13jW5cHZPe3IgBrE1Bh+U4e7M1Hv5ytHOqjQC/LqjW3LpR5QyRlwqaZ9i RHOQ== X-Gm-Message-State: APjAAAXJcVC4LGeyeRp4U67PZm/fu+9DOUDR4VNrqTdoX7GKgATl2k1q 5t+nzEzvgWVkOLmveJbM4dYNkOwJEtg= X-Received: by 2002:a63:6e4c:: with SMTP id j73mr7942189pgc.276.1553087909240; Wed, 20 Mar 2019 06:18:29 -0700 (PDT) Received: from localhost ([114.143.122.221]) by smtp.gmail.com with ESMTPSA id l5sm3652798pfi.97.2019.03.20.06.18.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Mar 2019 06:18:28 -0700 (PDT) From: Amit Kucheria To: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, bjorn.andersson@linaro.org, edubezval@gmail.com, andy.gross@linaro.org, Daniel Lezcano , David Brown , Zhang Rui Cc: linux-pm@vger.kernel.org Subject: [PATCHv3 02/23] drivers: thermal: tsens: Rename tsens_data Date: Wed, 20 Mar 2019 18:47:42 +0530 Message-Id: <286b40e37f26cad44f54dcb9420f1e7fb589a396.1553086065.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename to tsens_plat_data to denote that it is platform-data passed in at compile-time. Signed-off-by: Amit Kucheria --- drivers/thermal/qcom/tsens-8916.c | 2 +- drivers/thermal/qcom/tsens-8960.c | 2 +- drivers/thermal/qcom/tsens-8974.c | 2 +- drivers/thermal/qcom/tsens-v2.c | 4 ++-- drivers/thermal/qcom/tsens.c | 2 +- drivers/thermal/qcom/tsens.h | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) -- 2.17.1 diff --git a/drivers/thermal/qcom/tsens-8916.c b/drivers/thermal/qcom/tsens-8916.c index c6dd620ac029..66edcfca1526 100644 --- a/drivers/thermal/qcom/tsens-8916.c +++ b/drivers/thermal/qcom/tsens-8916.c @@ -97,7 +97,7 @@ static const struct tsens_ops ops_8916 = { .get_temp = get_temp_common, }; -const struct tsens_data data_8916 = { +const struct tsens_plat_data data_8916 = { .num_sensors = 5, .ops = &ops_8916, .reg_offsets = { [SROT_CTRL_OFFSET] = 0x0 }, diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c index 0f0adb302a7b..f3c3820e6e8e 100644 --- a/drivers/thermal/qcom/tsens-8960.c +++ b/drivers/thermal/qcom/tsens-8960.c @@ -277,7 +277,7 @@ static const struct tsens_ops ops_8960 = { .resume = resume_8960, }; -const struct tsens_data data_8960 = { +const struct tsens_plat_data data_8960 = { .num_sensors = 11, .ops = &ops_8960, }; diff --git a/drivers/thermal/qcom/tsens-8974.c b/drivers/thermal/qcom/tsens-8974.c index 3d3fda3d731b..5023f20afc14 100644 --- a/drivers/thermal/qcom/tsens-8974.c +++ b/drivers/thermal/qcom/tsens-8974.c @@ -229,7 +229,7 @@ static const struct tsens_ops ops_8974 = { .get_temp = get_temp_common, }; -const struct tsens_data data_8974 = { +const struct tsens_plat_data data_8974 = { .num_sensors = 11, .ops = &ops_8974, .reg_offsets = { [SROT_CTRL_OFFSET] = 0x0 }, diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c index 381a212872bf..cc98a61e093b 100644 --- a/drivers/thermal/qcom/tsens-v2.c +++ b/drivers/thermal/qcom/tsens-v2.c @@ -66,13 +66,13 @@ static const struct tsens_ops ops_generic_v2 = { .get_temp = get_temp_tsens_v2, }; -const struct tsens_data data_tsens_v2 = { +const struct tsens_plat_data data_tsens_v2 = { .ops = &ops_generic_v2, .reg_offsets = { [SROT_CTRL_OFFSET] = 0x4 }, }; /* Kept around for backward compatibility with old msm8996.dtsi */ -const struct tsens_data data_8996 = { +const struct tsens_plat_data data_8996 = { .num_sensors = 13, .ops = &ops_generic_v2, .reg_offsets = { [SROT_CTRL_OFFSET] = 0x4 }, diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c index f1ec9bbe4717..065ec2189bd3 100644 --- a/drivers/thermal/qcom/tsens.c +++ b/drivers/thermal/qcom/tsens.c @@ -102,7 +102,7 @@ static int tsens_probe(struct platform_device *pdev) struct device *dev; struct device_node *np; struct tsens_device *tmdev; - const struct tsens_data *data; + const struct tsens_plat_data *data; const struct of_device_id *id; u32 num_sensors; diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h index 89318523c848..232376c690cc 100644 --- a/drivers/thermal/qcom/tsens.h +++ b/drivers/thermal/qcom/tsens.h @@ -65,13 +65,13 @@ enum reg_list { }; /** - * struct tsens_data - tsens platform data + * struct tsens_plat_data - tsens compile-time platform data * @num_sensors: Number of sensors supported by platform * @ops: operations the tsens instance supports * @hw_ids: Subset of sensors ids supported by platform, if not the first n * @reg_offsets: Register offsets for commonly used registers */ -struct tsens_data { +struct tsens_plat_data { const u32 num_sensors; const struct tsens_ops *ops; const u16 reg_offsets[REG_ARRAY_SIZE]; @@ -117,8 +117,8 @@ int init_common(struct tsens_device *); int get_temp_common(struct tsens_device *, int, int *); /* TSENS v1 targets */ -extern const struct tsens_data data_8916, data_8974, data_8960; +extern const struct tsens_plat_data data_8916, data_8974, data_8960; /* TSENS v2 targets */ -extern const struct tsens_data data_8996, data_tsens_v2; +extern const struct tsens_plat_data data_8996, data_tsens_v2; #endif /* __QCOM_TSENS_H__ */