On 02/08/20 1:43 pm, Marc Dietrich wrote: > Hello Rohit, > > On Sat, 25 Jul 2020, Rohit K Bharadwaj wrote: > >> changed usage of slave (which is deprecated) to secondary without breaking the driver >> >> Tested-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> >> Acked-by: Marc Dietrich <marvin24@xxxxxxxxx> >> Signed-off-by: Rohit K Bharadwaj <bharadwaj.rohit8@xxxxxxxxx> > > please don't add "*-by"'s by yourself when you send a new patch version. > These will be added "automatically" during the patch handling. I just said, I *will* ack your patch, when you resent it, not that I did it already. > > Thanks! > > Marc > >> --- >> v4: undo the changes (which broke the driver) to this line: if (of_property_read_u32(dev->of_node, "slave-addr", &nvec->i2c_addr)) >> v3: change patch subject, add version history >> v2: add changelog text in body of mail >> v1: fix style issues by changing usage of slave to secondary >> >> drivers/staging/nvec/nvec.c | 10 +++++----- >> 1 file changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c >> index 360ec0407740..a7e995bfe989 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); >> @@ -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 >> >> I'm sorry for the tags sir, I would make sure not to make the mistakes in future, Thanks for taking your time, I hope I can contribute on other aspects of Linux kernel. _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel