[PATCH] arm/tegra: Fix tegra irq_data conversion

[PATCH] arm/tegra: Fix tegra irq_data conversion

[Grant Likely]

Commit 37337a8d5e68d6e19075dbdb3acf4f1011dae972, "ARM: tegra: irq_data
conversion." missed changing one reference to 'irq' in the function
tegra_gpio_irq_set_type().  This patch fixes the build error.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
 arch/arm/mach-tegra/gpio.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-tegra/gpio.c b/arch/arm/mach-tegra/gpio.c
index bd06620..ad80488 100644
--- a/arch/arm/mach-tegra/gpio.c
+++ b/arch/arm/mach-tegra/gpio.c
@@ -207,9 +207,9 @@ static int tegra_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 	spin_unlock_irqrestore(&bank->lvl_lock[port], flags);
 
 	if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
-		__set_irq_handler_unlocked(irq, handle_level_irq);
+		__set_irq_handler_unlocked(d->irq, handle_level_irq);
 	else if (type & (IRQ_TYPE_EDGE_FALLING | IRQ_TYPE_EDGE_RISING))
-		__set_irq_handler_unlocked(irq, handle_edge_irq);
+		__set_irq_handler_unlocked(d->irq, handle_edge_irq);
 
 	return 0;
 }

[PATCH] arm/tegra: Fix tegra irq_data conversion

[Lennert Buytenhek]

On Sat, Jan 15, 2011 at 10:41:27PM -0700, Grant Likely wrote:

> Commit 37337a8d5e68d6e19075dbdb3acf4f1011dae972, "ARM: tegra: irq_data
> conversion." missed changing one reference to 'irq' in the function
> tegra_gpio_irq_set_type().  This patch fixes the build error.
> 
> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

Acked-by: Lennert Buytenhek <buytenh@secretlab.ca>

I built this queue against all defconfigs, but there doesn't seem to
be one for tegra at the moment, which is why I missed this.

[PATCH] arm/tegra: Fix tegra irq_data conversion

[Olof Johansson]

On Sun, Jan 16, 2011 at 2:21 AM, Lennert Buytenhek
<buytenh@wantstofly.org> wrote:
> On Sat, Jan 15, 2011 at 10:41:27PM -0700, Grant Likely wrote:
>
>> Commit 37337a8d5e68d6e19075dbdb3acf4f1011dae972, "ARM: tegra: irq_data
>> conversion." missed changing one reference to 'irq' in the function
>> tegra_gpio_irq_set_type(). ?This patch fixes the build error.
>>
>> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>
> Acked-by: Lennert Buytenhek <buytenh@secretlab.ca>

Acked-by: Olof Johansson <olof@lixom.net>

> I built this queue against all defconfigs, but there doesn't seem to
> be one for tegra at the moment, which is why I missed this.

Yep, planning on fixing this for .39.


-Olof

[PATCH] arm/tegra: Fix tegra irq_data conversion

[Colin Cross]

On Sun, Jan 16, 2011 at 7:53 AM, Olof Johansson <olof@lixom.net> wrote:
> On Sun, Jan 16, 2011 at 2:21 AM, Lennert Buytenhek
> <buytenh@wantstofly.org> wrote:
>> On Sat, Jan 15, 2011 at 10:41:27PM -0700, Grant Likely wrote:
>>
>>> Commit 37337a8d5e68d6e19075dbdb3acf4f1011dae972, "ARM: tegra: irq_data
>>> conversion." missed changing one reference to 'irq' in the function
>>> tegra_gpio_irq_set_type(). ?This patch fixes the build error.
>>>
>>> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>>
>> Acked-by: Lennert Buytenhek <buytenh@secretlab.ca>
>
> Acked-by: Olof Johansson <olof@lixom.net>
>
>> I built this queue against all defconfigs, but there doesn't seem to
>> be one for tegra at the moment, which is why I missed this.
>
> Yep, planning on fixing this for .39.
>
>
> -Olof
>

This should get fixed in .38.  Has someone picked it up, or should I
put it in through my tree?

[PATCH] arm/tegra: Fix tegra irq_data conversion

[Grant Likely]

On Mon, Jan 17, 2011 at 3:17 PM, Colin Cross <ccross@android.com> wrote:
> On Sun, Jan 16, 2011 at 7:53 AM, Olof Johansson <olof@lixom.net> wrote:
>> On Sun, Jan 16, 2011 at 2:21 AM, Lennert Buytenhek
>> <buytenh@wantstofly.org> wrote:
>>> On Sat, Jan 15, 2011 at 10:41:27PM -0700, Grant Likely wrote:
>>>
>>>> Commit 37337a8d5e68d6e19075dbdb3acf4f1011dae972, "ARM: tegra: irq_data
>>>> conversion." missed changing one reference to 'irq' in the function
>>>> tegra_gpio_irq_set_type(). ?This patch fixes the build error.
>>>>
>>>> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>>>
>>> Acked-by: Lennert Buytenhek <buytenh@secretlab.ca>
>>
>> Acked-by: Olof Johansson <olof@lixom.net>
>>
>>> I built this queue against all defconfigs, but there doesn't seem to
>>> be one for tegra at the moment, which is why I missed this.
>>
>> Yep, planning on fixing this for .39.
>>
>>
>> -Olof
>>
>
> This should get fixed in .38. ?Has someone picked it up, or should I
> put it in through my tree?

I don't think Olof picked it up (seeing as he only acked it and it's
not in Linus' tree).  You should take it through your tree.

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

[PATCH] arm/tegra: Fix tegra irq_data conversion

[Grant Likely]

On Mon, Jan 17, 2011 at 3:49 PM, Grant Likely <grant.likely@secretlab.ca> wrote:
> On Mon, Jan 17, 2011 at 3:17 PM, Colin Cross <ccross@android.com> wrote:
>> On Sun, Jan 16, 2011 at 7:53 AM, Olof Johansson <olof@lixom.net> wrote:
>>> On Sun, Jan 16, 2011 at 2:21 AM, Lennert Buytenhek
>>> <buytenh@wantstofly.org> wrote:
>>>> On Sat, Jan 15, 2011 at 10:41:27PM -0700, Grant Likely wrote:
>>>>
>>>>> Commit 37337a8d5e68d6e19075dbdb3acf4f1011dae972, "ARM: tegra: irq_data
>>>>> conversion." missed changing one reference to 'irq' in the function
>>>>> tegra_gpio_irq_set_type(). ?This patch fixes the build error.
>>>>>
>>>>> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>>>>
>>>> Acked-by: Lennert Buytenhek <buytenh@secretlab.ca>
>>>
>>> Acked-by: Olof Johansson <olof@lixom.net>
>>>
>>>> I built this queue against all defconfigs, but there doesn't seem to
>>>> be one for tegra at the moment, which is why I missed this.
>>>
>>> Yep, planning on fixing this for .39.
>>>
>>>
>>> -Olof
>>>
>>
>> This should get fixed in .38. ?Has someone picked it up, or should I
>> put it in through my tree?
>
> I don't think Olof picked it up (seeing as he only acked it and it's
> not in Linus' tree). ?You should take it through your tree.

Ping?  I've not seen this hit Linus' tree yet.  Do you want me to take
care of it?

g.

[PATCH] arm/tegra: Fix tegra irq_data conversion

[Colin Cross]

On Wed, Jan 26, 2011 at 7:41 PM, Grant Likely <grant.likely@secretlab.ca> wrote:
> On Mon, Jan 17, 2011 at 3:49 PM, Grant Likely <grant.likely@secretlab.ca> wrote:
>> On Mon, Jan 17, 2011 at 3:17 PM, Colin Cross <ccross@android.com> wrote:
>>> On Sun, Jan 16, 2011 at 7:53 AM, Olof Johansson <olof@lixom.net> wrote:
>>>> On Sun, Jan 16, 2011 at 2:21 AM, Lennert Buytenhek
>>>> <buytenh@wantstofly.org> wrote:
>>>>> On Sat, Jan 15, 2011 at 10:41:27PM -0700, Grant Likely wrote:
>>>>>
>>>>>> Commit 37337a8d5e68d6e19075dbdb3acf4f1011dae972, "ARM: tegra: irq_data
>>>>>> conversion." missed changing one reference to 'irq' in the function
>>>>>> tegra_gpio_irq_set_type(). ?This patch fixes the build error.
>>>>>>
>>>>>> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>>>>>
>>>>> Acked-by: Lennert Buytenhek <buytenh@secretlab.ca>
>>>>
>>>> Acked-by: Olof Johansson <olof@lixom.net>
>>>>
>>>>> I built this queue against all defconfigs, but there doesn't seem to
>>>>> be one for tegra at the moment, which is why I missed this.
>>>>
>>>> Yep, planning on fixing this for .39.
>>>>
>>>>
>>>> -Olof
>>>>
>>>
>>> This should get fixed in .38. ?Has someone picked it up, or should I
>>> put it in through my tree?
>>
>> I don't think Olof picked it up (seeing as he only acked it and it's
>> not in Linus' tree). ?You should take it through your tree.
>
> Ping? ?I've not seen this hit Linus' tree yet. ?Do you want me to take
> care of it?

I confused your previous request for the struct clk patch with this
patch.  I just sent a pull request with both this and the struct clk
patch to Linus.

[PATCH] arm/tegra: Fix tegra irq_data conversion

[Grant Likely]

On Wed, Jan 26, 2011 at 10:42 PM, Colin Cross <ccross@android.com> wrote:
> On Wed, Jan 26, 2011 at 7:41 PM, Grant Likely <grant.likely@secretlab.ca> wrote:
>> On Mon, Jan 17, 2011 at 3:49 PM, Grant Likely <grant.likely@secretlab.ca> wrote:
>>> On Mon, Jan 17, 2011 at 3:17 PM, Colin Cross <ccross@android.com> wrote:
>>>> On Sun, Jan 16, 2011 at 7:53 AM, Olof Johansson <olof@lixom.net> wrote:
>>>>> On Sun, Jan 16, 2011 at 2:21 AM, Lennert Buytenhek
>>>>> <buytenh@wantstofly.org> wrote:
>>>>>> On Sat, Jan 15, 2011 at 10:41:27PM -0700, Grant Likely wrote:
>>>>>>
>>>>>>> Commit 37337a8d5e68d6e19075dbdb3acf4f1011dae972, "ARM: tegra: irq_data
>>>>>>> conversion." missed changing one reference to 'irq' in the function
>>>>>>> tegra_gpio_irq_set_type(). ?This patch fixes the build error.
>>>>>>>
>>>>>>> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
>>>>>>
>>>>>> Acked-by: Lennert Buytenhek <buytenh@secretlab.ca>
>>>>>
>>>>> Acked-by: Olof Johansson <olof@lixom.net>
>>>>>
>>>>>> I built this queue against all defconfigs, but there doesn't seem to
>>>>>> be one for tegra at the moment, which is why I missed this.
>>>>>
>>>>> Yep, planning on fixing this for .39.
>>>>>
>>>>>
>>>>> -Olof
>>>>>
>>>>
>>>> This should get fixed in .38. ?Has someone picked it up, or should I
>>>> put it in through my tree?
>>>
>>> I don't think Olof picked it up (seeing as he only acked it and it's
>>> not in Linus' tree). ?You should take it through your tree.
>>
>> Ping? ?I've not seen this hit Linus' tree yet. ?Do you want me to take
>> care of it?
>
> I confused your previous request for the struct clk patch with this
> patch. ?I just sent a pull request with both this and the struct clk
> patch to Linus.

Cool, thanks.

g.


-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.