diff mbox series

[v2,3/5] gpio: tegra186: Rename flow variable to type

Message ID 20181129170312.23625-4-thierry.reding@gmail.com
State New
Headers show
Series Implement wake event support on Tegra186 and later | expand

Commit Message

Thierry Reding Nov. 29, 2018, 5:03 p.m. UTC 
From: Thierry Reding <treding@nvidia.com>

The IRQ core code refers to the interrupt type by that name, whereas the
term flow is almost never used. Some GPIO controllers use the term
flow_type, but it is most consistent to just go with the IRQ core
terminology.

Signed-off-by: Thierry Reding <treding@nvidia.com>
---
 drivers/gpio/gpio-tegra186.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Linus Walleij Dec. 14, 2018, 1:34 p.m. UTC | #1 
On Thu, Nov 29, 2018 at 6:03 PM Thierry Reding <thierry.reding@gmail.com> wrote:

> From: Thierry Reding <treding@nvidia.com>
>
> The IRQ core code refers to the interrupt type by that name, whereas the
> term flow is almost never used. Some GPIO controllers use the term
> flow_type, but it is most consistent to just go with the IRQ core
> terminology.
>
> Signed-off-by: Thierry Reding <treding@nvidia.com>

Patch applied.

No need to wait for genirq or other changes to apply this.

Yours,
Linus Walleij
Thierry Reding Dec. 14, 2018, 1:36 p.m. UTC | #2 
On Fri, Dec 14, 2018 at 02:34:43PM +0100, Linus Walleij wrote:
> On Thu, Nov 29, 2018 at 6:03 PM Thierry Reding <thierry.reding@gmail.com> wrote:
> 
> > From: Thierry Reding <treding@nvidia.com>
> >
> > The IRQ core code refers to the interrupt type by that name, whereas the
> > term flow is almost never used. Some GPIO controllers use the term
> > flow_type, but it is most consistent to just go with the IRQ core
> > terminology.
> >
> > Signed-off-by: Thierry Reding <treding@nvidia.com>
> 
> Patch applied.
> 
> No need to wait for genirq or other changes to apply this.

The genirq patch was acked by both Thomas and Marc. Were you waiting for
anything else on the rest of this series?

Thierry
Linus Walleij Dec. 14, 2018, 1:51 p.m. UTC | #3 
On Fri, Dec 14, 2018 at 2:36 PM Thierry Reding <thierry.reding@gmail.com> wrote:
> On Fri, Dec 14, 2018 at 02:34:43PM +0100, Linus Walleij wrote:
> > On Thu, Nov 29, 2018 at 6:03 PM Thierry Reding <thierry.reding@gmail.com> wrote:
> >
> > > From: Thierry Reding <treding@nvidia.com>
> > >
> > > The IRQ core code refers to the interrupt type by that name, whereas the
> > > term flow is almost never used. Some GPIO controllers use the term
> > > flow_type, but it is most consistent to just go with the IRQ core
> > > terminology.
> > >
> > > Signed-off-by: Thierry Reding <treding@nvidia.com>
> >
> > Patch applied.
> >
> > No need to wait for genirq or other changes to apply this.
>
> The genirq patch was acked by both Thomas and Marc. Were you waiting for
> anything else on the rest of this series?

Yeah I had some comments on patch 1 (sorry for slowness ...)
but it's something I think you can fix up and test in 30 min.

Yours,
Linus Walleij
diff mbox series

Patch

diff --git a/drivers/gpio/gpio-tegra186.c b/drivers/gpio/gpio-tegra186.c
index 9d0292c8a199..66ec38bb7954 100644
--- a/drivers/gpio/gpio-tegra186.c
+++ b/drivers/gpio/gpio-tegra186.c
@@ -279,7 +279,7 @@  static void tegra186_irq_unmask(struct irq_data *data)
 	writel(value, base + TEGRA186_GPIO_ENABLE_CONFIG);
 }
 
-static int tegra186_irq_set_type(struct irq_data *data, unsigned int flow)
+static int tegra186_irq_set_type(struct irq_data *data, unsigned int type)
 {
 	struct tegra_gpio *gpio = irq_data_get_irq_chip_data(data);
 	void __iomem *base;
@@ -293,7 +293,7 @@  static int tegra186_irq_set_type(struct irq_data *data, unsigned int flow)
 	value &= ~TEGRA186_GPIO_ENABLE_CONFIG_TRIGGER_TYPE_MASK;
 	value &= ~TEGRA186_GPIO_ENABLE_CONFIG_TRIGGER_LEVEL;
 
-	switch (flow & IRQ_TYPE_SENSE_MASK) {
+	switch (type & IRQ_TYPE_SENSE_MASK) {
 	case IRQ_TYPE_NONE:
 		break;
 
@@ -325,7 +325,7 @@  static int tegra186_irq_set_type(struct irq_data *data, unsigned int flow)
 
 	writel(value, base + TEGRA186_GPIO_ENABLE_CONFIG);
 
-	if ((flow & IRQ_TYPE_EDGE_BOTH) == 0)
+	if ((type & IRQ_TYPE_EDGE_BOTH) == 0)
 		irq_set_handler_locked(data, handle_level_irq);
 	else
 		irq_set_handler_locked(data, handle_edge_irq);