DriverDev-Devel Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] change slave occurence to secondary everywhere
@ 2020-07-23 15:15 Rohit K Bharadwaj
  2020-07-23 17:06 ` Greg KH
                   ` (2 more replies)
  0 siblings, 3 replies; 24+ messages in thread
From: Rohit K Bharadwaj @ 2020-07-23 15:15 UTC (permalink / raw)
  To: marvin24, gregkh, p.zabel; +Cc: linux-tegra, Rohit K Bharadwaj, devel, ac100

changed usage of slave (deprecated) to secondary

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

^ permalink raw reply	[flat|nested] 24+ messages in thread

end of thread, back to index

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-23 15:15 [PATCH] change slave occurence to secondary everywhere Rohit K Bharadwaj
2020-07-23 17:06 ` Greg KH
2020-07-24  4:55   ` Rohit Bharadwaj
2020-07-24  4:36 ` [PATCH v3] staging: nvec: change usage of slave to secondary Rohit K Bharadwaj
2020-07-24  8:14   ` Rohit Bharadwaj
2020-07-24  8:28     ` Greg KH
2020-07-24  8:35       ` Rohit Bharadwaj
2020-07-24 16:33         ` Marc Dietrich
2020-07-24 16:36           ` Marc Dietrich
2020-07-24 16:57             ` Rohit K Bharadwaj
2020-07-24 20:42               ` Marc Dietrich
2020-07-25  6:50                 ` Rohit K Bharadwaj
2020-07-24 14:09   ` Dan Carpenter
2020-07-24 15:51     ` Rohit K Bharadwaj
2020-07-24 16:23       ` Greg KH
2020-07-25  6:29   ` [PATCH v4] " Rohit K Bharadwaj
2020-07-25 12:01     ` Michał Mirosław
2020-07-25 12:31       ` Rohit K Bharadwaj
2020-07-25 12:50         ` Michał Mirosław
2020-07-25 13:02           ` Rohit K Bharadwaj
2020-08-02  8:07           ` Marc Dietrich
2020-08-02  8:13     ` Marc Dietrich
2020-08-02  9:09       ` Rohit K Bharadwaj
2020-07-24 14:07 ` [PATCH] change slave occurence to secondary everywhere Dan Carpenter

DriverDev-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/driverdev-devel/0 driverdev-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 driverdev-devel driverdev-devel/ https://lore.kernel.org/driverdev-devel \
		driverdev-devel@linuxdriverproject.org devel@driverdev.osuosl.org
	public-inbox-index driverdev-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.linuxdriverproject.driverdev-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git