From: Rohit K Bharadwaj <bharadwaj.rohit8@gmail.com>
To: marvin24@gmx.de, gregkh@linuxfoundation.org, p.zabel@pengutronix.de
Cc: linux-tegra@vger.kernel.org,
Rohit K Bharadwaj <bharadwaj.rohit8@gmail.com>,
devel@driverdev.osuosl.org, ac100@lists.launchpad.net
Subject: [PATCH] change slave occurence to secondary everywhere
Date: Thu, 23 Jul 2020 20:28:11 +0530 [thread overview]
Message-ID: <20200723145811.21109-1-bharadwaj.rohit8@gmail.com> (raw)
Signed-off-by: Rohit K Bharadwaj <bharadwaj.rohit8@gmail.com>
---
drivers/staging/nvec/nvec.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 360ec0407740..5d7b66719a39 100644
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -718,7 +718,7 @@ static irqreturn_t nvec_interrupt(int irq, void *dev)
return IRQ_HANDLED;
}
-static void tegra_init_i2c_slave(struct nvec_chip *nvec)
+static void tegra_init_i2c_secondary(struct nvec_chip *nvec)
{
u32 val;
@@ -744,7 +744,7 @@ static void tegra_init_i2c_slave(struct nvec_chip *nvec)
}
#ifdef CONFIG_PM_SLEEP
-static void nvec_disable_i2c_slave(struct nvec_chip *nvec)
+static void nvec_disable_i2c_secondary(struct nvec_chip *nvec)
{
disable_irq(nvec->irq);
writel(I2C_SL_NEWSL | I2C_SL_NACK, nvec->base + I2C_SL_CNFG);
@@ -784,7 +784,7 @@ static int tegra_nvec_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, nvec);
nvec->dev = dev;
- if (of_property_read_u32(dev->of_node, "slave-addr", &nvec->i2c_addr)) {
+ if (of_property_read_u32(dev->of_node, "secondary-addr", &nvec->i2c_addr)) {
dev_err(dev, "no i2c address specified");
return -ENODEV;
}
@@ -839,7 +839,7 @@ static int tegra_nvec_probe(struct platform_device *pdev)
}
disable_irq(nvec->irq);
- tegra_init_i2c_slave(nvec);
+ tegra_init_i2c_secondary(nvec);
/* enable event reporting */
nvec_toggle_global_events(nvec, true);
@@ -913,7 +913,7 @@ static int nvec_suspend(struct device *dev)
if (!err)
nvec_msg_free(nvec, msg);
- nvec_disable_i2c_slave(nvec);
+ nvec_disable_i2c_secondary(nvec);
return 0;
}
@@ -923,7 +923,7 @@ static int nvec_resume(struct device *dev)
struct nvec_chip *nvec = dev_get_drvdata(dev);
dev_dbg(nvec->dev, "resuming\n");
- tegra_init_i2c_slave(nvec);
+ tegra_init_i2c_secondary(nvec);
nvec_toggle_global_events(nvec, true);
return 0;
--
2.25.1
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next reply other threads:[~2020-07-23 14:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-23 14:58 Rohit K Bharadwaj [this message]
2020-07-23 15:09 ` [PATCH] change slave occurence to secondary everywhere Greg KH
2020-07-24 14:06 ` Dan Carpenter
2020-07-23 15:15 Rohit K Bharadwaj
2020-07-23 17:06 ` Greg KH
2020-07-24 4:55 ` Rohit Bharadwaj
2020-07-24 14:07 ` Dan Carpenter
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=20200723145811.21109-1-bharadwaj.rohit8@gmail.com \
--to=bharadwaj.rohit8@gmail.com \
--cc=ac100@lists.launchpad.net \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-tegra@vger.kernel.org \
--cc=marvin24@gmx.de \
--cc=p.zabel@pengutronix.de \
/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).