From: Nicolin Chen <nicoleotsuka@gmail.com>
To: thierry.reding@gmail.com, joro@8bytes.org, will@kernel.org
Cc: vdumpa@nvidia.com, jonathanh@nvidia.com,
linux-tegra@vger.kernel.org, iommu@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, digetx@gmail.com
Subject: [PATCH v6 3/6] iommu/tegra-smmu: Rename struct tegra_smmu_swgroup *group to *swgrp
Date: Mon, 13 Sep 2021 18:38:55 -0700 [thread overview]
Message-ID: <20210914013858.31192-4-nicoleotsuka@gmail.com> (raw)
In-Reply-To: <20210914013858.31192-1-nicoleotsuka@gmail.com>
There are both tegra_smmu_swgroup and tegra_smmu_group structs
using "group" for their pointer instances. This gets confusing
to read the driver sometimes.
So this patch renames "group" of struct tegra_smmu_swgroup to
"swgrp" as a cleanup. Also renames its "find" function.
Note that we already have "swgroup" being used for an unsigned
int type variable that is inside struct tegra_smmu_swgroup, so
it's not able to use "swgroup" but only something like "swgrp".
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
---
drivers/iommu/tegra-smmu.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index a32ed347e25d..0f3883045ffa 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -334,35 +334,35 @@ static void tegra_smmu_domain_free(struct iommu_domain *domain)
}
static const struct tegra_smmu_swgroup *
-tegra_smmu_find_swgroup(struct tegra_smmu *smmu, unsigned int swgroup)
+tegra_smmu_find_swgrp(struct tegra_smmu *smmu, unsigned int swgroup)
{
- const struct tegra_smmu_swgroup *group = NULL;
+ const struct tegra_smmu_swgroup *swgrp = NULL;
unsigned int i;
for (i = 0; i < smmu->soc->num_swgroups; i++) {
if (smmu->soc->swgroups[i].swgroup == swgroup) {
- group = &smmu->soc->swgroups[i];
+ swgrp = &smmu->soc->swgroups[i];
break;
}
}
- return group;
+ return swgrp;
}
static void tegra_smmu_enable(struct tegra_smmu *smmu, unsigned int swgroup,
unsigned int asid)
{
- const struct tegra_smmu_swgroup *group;
+ const struct tegra_smmu_swgroup *swgrp;
unsigned int i;
u32 value;
- group = tegra_smmu_find_swgroup(smmu, swgroup);
- if (group) {
- value = smmu_readl(smmu, group->reg);
+ swgrp = tegra_smmu_find_swgrp(smmu, swgroup);
+ if (swgrp) {
+ value = smmu_readl(smmu, swgrp->reg);
value &= ~SMMU_ASID_MASK;
value |= SMMU_ASID_VALUE(asid);
value |= SMMU_ASID_ENABLE;
- smmu_writel(smmu, value, group->reg);
+ smmu_writel(smmu, value, swgrp->reg);
} else {
pr_warn("%s group from swgroup %u not found\n", __func__,
swgroup);
@@ -385,17 +385,17 @@ static void tegra_smmu_enable(struct tegra_smmu *smmu, unsigned int swgroup,
static void tegra_smmu_disable(struct tegra_smmu *smmu, unsigned int swgroup,
unsigned int asid)
{
- const struct tegra_smmu_swgroup *group;
+ const struct tegra_smmu_swgroup *swgrp;
unsigned int i;
u32 value;
- group = tegra_smmu_find_swgroup(smmu, swgroup);
- if (group) {
- value = smmu_readl(smmu, group->reg);
+ swgrp = tegra_smmu_find_swgrp(smmu, swgroup);
+ if (swgrp) {
+ value = smmu_readl(smmu, swgrp->reg);
value &= ~SMMU_ASID_MASK;
value |= SMMU_ASID_VALUE(asid);
value &= ~SMMU_ASID_ENABLE;
- smmu_writel(smmu, value, group->reg);
+ smmu_writel(smmu, value, swgrp->reg);
}
for (i = 0; i < smmu->soc->num_clients; i++) {
@@ -1008,11 +1008,11 @@ static int tegra_smmu_swgroups_show(struct seq_file *s, void *data)
seq_printf(s, "------------------------\n");
for (i = 0; i < smmu->soc->num_swgroups; i++) {
- const struct tegra_smmu_swgroup *group = &smmu->soc->swgroups[i];
+ const struct tegra_smmu_swgroup *swgrp = &smmu->soc->swgroups[i];
const char *status;
unsigned int asid;
- value = smmu_readl(smmu, group->reg);
+ value = smmu_readl(smmu, swgrp->reg);
if (value & SMMU_ASID_ENABLE)
status = "yes";
@@ -1021,7 +1021,7 @@ static int tegra_smmu_swgroups_show(struct seq_file *s, void *data)
asid = value & SMMU_ASID_MASK;
- seq_printf(s, "%-9s %-7s %#04x\n", group->name, status,
+ seq_printf(s, "%-9s %-7s %#04x\n", swgrp->name, status,
asid);
}
--
2.17.1
next prev parent reply other threads:[~2021-09-14 1:47 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 1:38 [PATCH v6 0/6] iommu/tegra-smmu: Add pagetable mappings to debugfs Nicolin Chen
2021-09-14 1:38 ` [PATCH v6 1/6] iommu/tegra-smmu: Rename struct iommu_group *group to *grp Nicolin Chen
2021-10-07 16:43 ` Thierry Reding
2021-09-14 1:38 ` [PATCH v6 2/6] iommu/tegra-smmu: Rename struct tegra_smmu_group_soc *soc to *group_soc Nicolin Chen
2021-10-07 16:50 ` Thierry Reding
2021-10-07 20:14 ` Nicolin Chen
2021-09-14 1:38 ` Nicolin Chen [this message]
2021-10-07 16:57 ` [PATCH v6 3/6] iommu/tegra-smmu: Rename struct tegra_smmu_swgroup *group to *swgrp Thierry Reding
2021-10-07 20:29 ` Nicolin Chen
2021-09-14 1:38 ` [PATCH v6 4/6] iommu/tegra-smmu: Use swgrp pointer instead of swgroup id Nicolin Chen
2021-10-07 16:59 ` Thierry Reding
2021-09-14 1:38 ` [PATCH v6 5/6] iommu/tegra-smmu: Attach as pointer to tegra_smmu_group Nicolin Chen
2021-10-07 17:02 ` Thierry Reding
2021-09-14 1:38 ` [PATCH v6 6/6] iommu/tegra-smmu: Add pagetable mappings to debugfs Nicolin Chen
2021-09-14 13:29 ` Dmitry Osipenko
2021-09-14 18:49 ` Nicolin Chen
2021-09-14 19:20 ` Dmitry Osipenko
2021-09-15 4:38 ` Nicolin Chen
2021-09-15 12:09 ` Dmitry Osipenko
2021-09-15 12:18 ` Dmitry Osipenko
2021-09-15 22:19 ` Nicolin Chen
2021-10-07 17:13 ` Thierry Reding
2021-10-07 20:41 ` Nicolin Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210914013858.31192-4-nicoleotsuka@gmail.com \
--to=nicoleotsuka@gmail.com \
--cc=digetx@gmail.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jonathanh@nvidia.com \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=vdumpa@nvidia.com \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).