From patchwork Thu Feb 7 10:49:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 157690 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp487977jaa; Thu, 7 Feb 2019 02:50:12 -0800 (PST) X-Google-Smtp-Source: AHgI3IYsf42cEH19CyQIOeEbTuF7fxTyoU5VoQjcjAW0pvWJa1MV6OiQwCPsK9UdzPJAAWfqJdWb X-Received: by 2002:a17:902:ba8b:: with SMTP id k11mr15775108pls.177.1549536611951; Thu, 07 Feb 2019 02:50:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549536611; cv=none; d=google.com; s=arc-20160816; b=tnNBl8KrPitVvMImVHoWqJqQKW479ZCoGLoiFpaMOOlRpyrwHmreWx4K3t7AD02UXC FUcZbrEfQ7Jv0QG2fDgKN5IaWJmeqP01v9d2dNiZKPeYlEh96Pfi03RKi152QpM/KTs8 EkKUwYEA26NBphx6CKNYlkZJiRDPgHQQZ+eNtNLWtTMiaLEMFg6bvT5TMJgD70VXwDCp Whu8WuOY22J9H0z2fp276/IB82NI9Xj0mx0kFG8acVNK1RPmDQVwsLa6OaRhYE4NQhlp xocFj+srMcmD+yzj85CmH8bpdGAXx0WzIsYZTvnmQLJ4v8Ejbt5Mi9nyaY51aQsmVBNW E5lg== 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=PBny769jbckDVJTeLCDdfQwWLM1autKhomMDB7CIZY8ghVqImzt7wZMASmlLer5Vbn ZV+lUtCMSTzRH9sdgxBTwyZaMksFVQnx3KnIdq3Fm9v8J8wY6teC8cUmbChIwhL5ktMC Yr/ou5p9Pzv6+u6RtMI80NG/I8KhYtZ6jEhqce86QcCCghcuJzRmxx4Wl3p6hRqKqysH ulB433ppWApOjQDLY1/gu8FlzazcUbaPkxE+oYAn8xd7D5+legQ2wQS3K9BfWlqhmiWg xfW+IZKD8sIPMu4aPBC3kng5pAXPiOawMhZwKv6qjYpmeSrPKLqVfB1WIBXkLQckDcJK 8tAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=axHX+SI8; 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 t71si2001081pfa.244.2019.02.07.02.50.11; Thu, 07 Feb 2019 02:50:11 -0800 (PST) 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=axHX+SI8; 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 S1727099AbfBGKuJ (ORCPT + 31 others); Thu, 7 Feb 2019 05:50:09 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35338 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727074AbfBGKuJ (ORCPT ); Thu, 7 Feb 2019 05:50:09 -0500 Received: by mail-wr1-f66.google.com with SMTP id z18so10246171wrh.2 for ; Thu, 07 Feb 2019 02:50:08 -0800 (PST) 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=axHX+SI8VrHFD9eTNpJyqzKr/RCveBepo8QUYU1jO+KhECXGIKwjFLjwvuD3PAD5VN yfJ0TaSRiiGOt/Bl4Ftg39nXeCBchI7MWk9euMQ8tHXWvHJHDE0QcpjMYrLNll/FchoD frBWBQ0r3WcExc+3PvinKZ4d/Zv0OKBpZYaUAviBVBMpQl9gaLnl2w9sqiOkykXbZXUB /dLz9LICBZyCg6enI4MzGpS/nWHoxYnYrdgrgGF8Zt6I/jl1BYj77ZxKiw119nHCabnh kpO0TRbhh0wJSNk/Mx6T8FutpdLzqwVjbI1IMjJwBUFh4YBjSSgUs05iuUd1aVz5vWQE To1A== 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=K+Y10q5gXVoItuMESRRJ5uDrcVTEtij1mLSlGw+BxyaP1iHM9jrxzfqsbkHUDQ2Tha lUyxhlGzqnyO3UbPnDrFa6w9lVY+N0utQwYPNVxs7dh/w9K9ERiSlGlHHOk+dMA5MnaG JHL6jiFrquO4IY+guETSK3YJUYS1sBXG2p4y+g4DNSotCFOl7w5XG1lDwrjOLJY+vj/0 IeIYcLakenP5BghLaj0w2/pKX4e2Zl9cIsae/mkWUzkUWwmxhOYQujUDhLfR6xI4+CfH eDI2AHfVi0yYYfFe4FFhlul5zhio14SUhxuYgcXRgyBVNTQGnFZH8Dbc65Vwr+l4Wc1n +LSw== X-Gm-Message-State: AHQUAuY0PVSHjjYB+EJ4fhsA/AOTIFj8wYrkBSIWKKoiJUYp23w0V2G9 9S4gagIgix/XoFRxINBEf1fqGsZbQLQ= X-Received: by 2002:a5d:5101:: with SMTP id s1mr11704265wrt.89.1549536607260; Thu, 07 Feb 2019 02:50:07 -0800 (PST) Received: from localhost ([49.248.196.115]) by smtp.gmail.com with ESMTPSA id y145sm18945331wmd.30.2019.02.07.02.50.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Feb 2019 02:50:06 -0800 (PST) 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: [PATCH v1 02/24] drivers: thermal: tsens: Rename tsens_data Date: Thu, 7 Feb 2019 16:19:20 +0530 Message-Id: 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__ */