On 24/07/20 10:06 pm, Marc Dietrich wrote:
>
>
> On Fri, 24 Jul 2020, Marc Dietrich wrote:
>
>> Hi Rohit,
>>
>> On Fri, 24 Jul 2020, Rohit Bharadwaj wrote:
>>
>>> On 24/07/20 1:58 pm, Greg KH wrote:
>>>> On Fri, Jul 24, 2020 at 01:44:27PM +0530, Rohit Bharadwaj wrote:
>>>>> On 24/07/20 10:06 am, Rohit K Bharadwaj wrote:
>>>>>> changed usage of slave (deprecated) to secondary
>>>>>>
>>>>>> Signed-off-by: Rohit K Bharadwaj <bharadwaj.rohit8@xxxxxxxxx>
>>>>>> ---
>>>>>> 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 | 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;
>>>>>> }
>>
>> as Christoph said, please don't change this line.
>
> arr, I meant Dan of course ;-)
Dear all, thank you so much for your inputs, I will try to make some other patch which will not break the driver (hopefully :p), or if you give me permission to submit this patch itself by just keeping this one line
> if (of_property_read_u32(dev->of_node, "slave-addr", &nvec->i2c_addr))
unchanged, and provided it does not break the driver by doing so, I would gladly make the changes and submit v4 of the patch.
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
