From patchwork Thu Feb 28 12:20:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kucheria X-Patchwork-Id: 159346 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp571592jad; Thu, 28 Feb 2019 04:21:45 -0800 (PST) X-Google-Smtp-Source: AHgI3IbTH2FRsD+GOl8Aln3gb7mKdGxUSlFBQ2RwimEMQZIkCVH9b0SKmmtkQOWtmvNW8QbXSmLI X-Received: by 2002:aa7:87c6:: with SMTP id i6mr7048580pfo.208.1551356505752; Thu, 28 Feb 2019 04:21:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551356505; cv=none; d=google.com; s=arc-20160816; b=S57qK9jdEKF3bPVXj63qJ4JEO7kNeQm0PjOFq8DU4YWDSNYKVJz9ppZkTffiHtX8ee HyLMiBFY0Jtq/t5hyE1VzJfm4FyN7p/F1eDp7AUyhIHjxZGl7L/XLZDlmQ57vlDyRZIT L25NBIT9//1Jid57zfBxdHlneQYZ0zVYM/TVUVn6aEDeoSvKgx5jMVNArMsfJWEYCrmj 3JuEH5P5x0iwvVf7XOVxouQXp3NWegJqEhgMP8jnsL7KPwG0FrpK0oUazQ4RALp1SIQw r3EUKnJCdt9737csrOyt+Xxjp+7VO5bs6mSn6EL/Vi9Lr49MY2Nw6Ns7wg7qiZXyLmXS nC2A== 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=uFlpsbFOF3TQrGZpUirmpfQQ6t00+/Q6CnfqoFlN4WUMd0YWBouNuwPa9WkbeA/dcx jNwwB55HxhMO+ziVeY4r9cHXpE/k70kPlHKiZVsykj7X6g43A/ciSug3AP3cFRpSxwX9 qIhxR8ODSM+EwEE2lxycDszLEpX7nJEkEhF+5quccL4mmFzq2oMWwvKoUGAp2loh554u QPbfoWDPOfQXIOlW0ynvQqFHj4zIGOy1nM30tmHXahmVhmpyKz4lpZvzCYP3G2nDTOtQ VIrDezl4FvSiiln5haUYNBM1pq37V3bUx5CYKRjWCPD9l+lThgXsFuOV+ItSDtvlT3dP aprA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="YhXnH/Tu"; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 z190si2399365pgd.238.2019.02.28.04.21.45; Thu, 28 Feb 2019 04:21:45 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-pm-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="YhXnH/Tu"; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-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 S1731605AbfB1MVo (ORCPT + 11 others); Thu, 28 Feb 2019 07:21:44 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:40810 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731596AbfB1MVo (ORCPT ); Thu, 28 Feb 2019 07:21:44 -0500 Received: by mail-wm1-f66.google.com with SMTP id g20so7958024wmh.5 for ; Thu, 28 Feb 2019 04:21:43 -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=YhXnH/Tu/A4AckJvgc67KJixvqSw/SmjzG2Oib3OL9KFw7jswdw+ZtPb5zT0DHbU9c 23kCfJhIYI2xhqNXVpJzUd5+KDOAyy1LBkL4fvFTBhoKpuaCrwGlNW9L82+GC0FHrXnG n2+VGL9UguTZ8EIG0iMGPCNmwlVYBBisELEUYrfx/+PtyiqcAp/9FvdeHvs9Q/2FCSH7 /adxczFppCzGEEg5rh3YfuRsZEPhS3eTlcOndo5uElEpkI5B68TQjLtgW+0XvAZXZ5aI Cy1jQewzRoCwqhPFeuLfFlopcwceqeVr1yDqxUZ2OhrWSdovEtvFIsw/pDlcZa1xnNXn nzhQ== 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=R1zlw4O8ruBr5CELi+S/SQqcXMFfm5iclVTskQIQXTA1G2+iPOTSFGATTXnPQd06xS lgrMV2zUyA4z/PvuP9OBYkfyeW8UdCurpKl/JiDaiUgLOmmLywDv9liFYbu63FrHA2S6 zdjcKtXARWWbCkqYxw4gGokFybJCk6b42A6sV5ZY3LU72GwVVePcUp0uU4JU4ZC4hCep XzZkIz8o+hCCSl6UHVEUjnxjVeW/ngoB8zaJ0ihNHp+/s1lpepXEX+OcHNBj5Ior53LN kjYjFQuk6/9nqPODEPRHrmNSquh/azc0sp1/M46V8oiUI53pjMQIhc6+Ra1W8do1GbYW Ic5g== X-Gm-Message-State: APjAAAVoHjRbjSrtrHkay5WWgentKbsaS0RZLOCeI+J5WI7ZDYRiNUj4 QWnuymDJjwUtudy3WJAJ2917jg== X-Received: by 2002:a1c:a688:: with SMTP id p130mr2925081wme.53.1551356502172; Thu, 28 Feb 2019 04:21:42 -0800 (PST) Received: from localhost ([49.248.54.130]) by smtp.gmail.com with ESMTPSA id d21sm52650758wrc.44.2019.02.28.04.21.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 04:21:41 -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 v2 02/24] drivers: thermal: tsens: Rename tsens_data Date: Thu, 28 Feb 2019 17:50:52 +0530 Message-Id: <8daf93badafc5adfe0e9ea18b7382e9d6de6c719.1551355503.git.amit.kucheria@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@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__ */