2013-10-08 07:19:16

by Sonic Zhang

Subject: [PATCH] pinctrl: pinctrl-adi2: GPIO output value should be set after the GPIO interrupt is disabled.

From: Sonic Zhang <[email protected]>

Use BIT macro as well.

Signed-off-by: Sonic Zhang <[email protected]>
---
drivers/pinctrl/pinctrl-adi2.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
index a74e6f4..7a39562 100644
--- a/drivers/pinctrl/pinctrl-adi2.c
+++ b/drivers/pinctrl/pinctrl-adi2.c
@@ -766,9 +766,9 @@ static void adi_gpio_set_value(struct gpio_chip *chip, unsigned offset,
spin_lock_irqsave(&port->lock, flags);

if (value)
- writew(1 << offset, &regs->data_set);
+ writew(BIT(offset), &regs->data_set);
else
- writew(1 << offset, &regs->data_clear);
+ writew(BIT(offset), &regs->data_clear);

spin_unlock_irqrestore(&port->lock, flags);
}
@@ -780,12 +780,14 @@ static int adi_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
struct gpio_port_t *regs = port->regs;
unsigned long flags;

- adi_gpio_set_value(chip, offset, value);
-
spin_lock_irqsave(&port->lock, flags);

- writew(readw(&regs->inen) & ~(1 << offset), &regs->inen);
- writew(1 << offset, &regs->dir_set);
+ writew(readw(&regs->inen) & ~BIT(offset), &regs->inen);
+ if (value)
+ writew(BIT(offset), &regs->data_set);
+ else
+ writew(BIT(offset), &regs->data_clear);
+ writew(BIT(offset), &regs->dir_set);

spin_unlock_irqrestore(&port->lock, flags);

--
1.8.2.3

2013-10-08 07:48:09

by Axel Lin

Subject: Re: [PATCH] pinctrl: pinctrl-adi2: GPIO output value should be set after the GPIO interrupt is disabled.

2013/10/8 Sonic Zhang <[email protected]>:
> From: Sonic Zhang <[email protected]>
>
> Use BIT macro as well.
>
> Signed-off-by: Sonic Zhang <[email protected]>
> ---
> drivers/pinctrl/pinctrl-adi2.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
> index a74e6f4..7a39562 100644
> --- a/drivers/pinctrl/pinctrl-adi2.c
> +++ b/drivers/pinctrl/pinctrl-adi2.c
> @@ -766,9 +766,9 @@ static void adi_gpio_set_value(struct gpio_chip *chip, unsigned offset,
> spin_lock_irqsave(&port->lock, flags);
>
> if (value)
> - writew(1 << offset, &regs->data_set);
> + writew(BIT(offset), &regs->data_set);
> else
> - writew(1 << offset, &regs->data_clear);
> + writew(BIT(offset), &regs->data_clear);
>
> spin_unlock_irqrestore(&port->lock, flags);
> }
> @@ -780,12 +780,14 @@ static int adi_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
> struct gpio_port_t *regs = port->regs;
> unsigned long flags;
>
> - adi_gpio_set_value(chip, offset, value);
> -
> spin_lock_irqsave(&port->lock, flags);
>
> - writew(readw(&regs->inen) & ~(1 << offset), &regs->inen);
> - writew(1 << offset, &regs->dir_set);
> + writew(readw(&regs->inen) & ~BIT(offset), &regs->inen);
> + if (value)
> + writew(BIT(offset), &regs->data_set);
> + else
> + writew(BIT(offset), &regs->data_clear);

I think we can add an unlocked version of adi_gpio_set_value() to
avoid duplicated code.

2013-10-08 08:00:01

by Sonic Zhang

Subject: Re: [PATCH] pinctrl: pinctrl-adi2: GPIO output value should be set after the GPIO interrupt is disabled.

Hi Axel,

On Tue, Oct 8, 2013 at 3:48 PM, Axel Lin <[email protected]> wrote:
> 2013/10/8 Sonic Zhang <[email protected]>:
>> From: Sonic Zhang <[email protected]>
>>
>> Use BIT macro as well.
>>
>> Signed-off-by: Sonic Zhang <[email protected]>
>> ---
>> drivers/pinctrl/pinctrl-adi2.c | 14 ++++++++------
>> 1 file changed, 8 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c
>> index a74e6f4..7a39562 100644
>> --- a/drivers/pinctrl/pinctrl-adi2.c
>> +++ b/drivers/pinctrl/pinctrl-adi2.c
>> @@ -766,9 +766,9 @@ static void adi_gpio_set_value(struct gpio_chip *chip, unsigned offset,
>> spin_lock_irqsave(&port->lock, flags);
>>
>> if (value)
>> - writew(1 << offset, &regs->data_set);
>> + writew(BIT(offset), &regs->data_set);
>> else
>> - writew(1 << offset, &regs->data_clear);
>> + writew(BIT(offset), &regs->data_clear);
>>
>> spin_unlock_irqrestore(&port->lock, flags);
>> }
>> @@ -780,12 +780,14 @@ static int adi_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
>> struct gpio_port_t *regs = port->regs;
>> unsigned long flags;
>>
>> - adi_gpio_set_value(chip, offset, value);
>> -
>> spin_lock_irqsave(&port->lock, flags);
>>
>> - writew(readw(&regs->inen) & ~(1 << offset), &regs->inen);
>> - writew(1 << offset, &regs->dir_set);
>> + writew(readw(&regs->inen) & ~BIT(offset), &regs->inen);
>> + if (value)
>> + writew(BIT(offset), &regs->data_set);
>> + else
>> + writew(BIT(offset), &regs->data_clear);
>
> I think we can add an unlocked version of adi_gpio_set_value() to
> avoid duplicated code.

That may be over engineering for such a simple code.

Regards,

Sonic

2013-10-09 11:09:14

by Linus Walleij

Subject: Re: [PATCH] pinctrl: pinctrl-adi2: GPIO output value should be set after the GPIO interrupt is disabled.

On Tue, Oct 8, 2013 at 9:31 AM, Sonic Zhang <[email protected]> wrote:

> From: Sonic Zhang <[email protected]>
>
> Use BIT macro as well.
>
> Signed-off-by: Sonic Zhang <[email protected]>

Patch applied.

Yours,
Linus Walleij