* [PATCH Resend] pinctrl: exynos: Fix build breakage
@ 2013-06-17 9:38 Sachin Kamat
2013-06-17 11:25 ` Linus Walleij
2013-06-17 11:57 ` Tomasz Figa
0 siblings, 2 replies; 6+ messages in thread
From: Sachin Kamat @ 2013-06-17 9:38 UTC (permalink / raw)
To: linux-kernel
Cc: linux-samsung-soc, linus.walleij, sachin.kamat, patches, Doug Anderson
'exynos_wkup_irq_ack' should be defined ahead of its call.
Fixes the following error:
drivers/pinctrl/pinctrl-exynos.c: In function ‘exynos_wkup_irq_mask’:
drivers/pinctrl/pinctrl-exynos.c:299:3: error: implicit declaration of
function ‘exynos_wkup_irq_ack’ [-Werror=implicit-function-declaration]
exynos_wkup_irq_ack(irqd);
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Doug Anderson <dianders@chromium.org>
---
Fixed the commit message.
---
drivers/pinctrl/pinctrl-exynos.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/pinctrl/pinctrl-exynos.c b/drivers/pinctrl/pinctrl-exynos.c
index 8cd5bf5..f9277bc 100644
--- a/drivers/pinctrl/pinctrl-exynos.c
+++ b/drivers/pinctrl/pinctrl-exynos.c
@@ -279,6 +279,15 @@ err_domains:
return ret;
}
+static void exynos_wkup_irq_ack(struct irq_data *irqd)
+{
+ struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd);
+ struct samsung_pinctrl_drv_data *d = b->drvdata;
+ unsigned long pend = d->ctrl->weint_pend + b->eint_offset;
+
+ writel(1 << irqd->hwirq, d->virt_base + pend);
+}
+
static void exynos_wkup_irq_mask(struct irq_data *irqd)
{
struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd);
@@ -307,15 +316,6 @@ static void exynos_wkup_irq_mask(struct irq_data *irqd)
spin_unlock_irqrestore(&b->slock, flags);
}
-static void exynos_wkup_irq_ack(struct irq_data *irqd)
-{
- struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd);
- struct samsung_pinctrl_drv_data *d = b->drvdata;
- unsigned long pend = d->ctrl->weint_pend + b->eint_offset;
-
- writel(1 << irqd->hwirq, d->virt_base + pend);
-}
-
static void exynos_wkup_irq_unmask(struct irq_data *irqd)
{
struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd);
--
1.7.9.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH Resend] pinctrl: exynos: Fix build breakage
2013-06-17 9:38 [PATCH Resend] pinctrl: exynos: Fix build breakage Sachin Kamat
@ 2013-06-17 11:25 ` Linus Walleij
2013-06-17 11:46 ` Sachin Kamat
2013-06-17 11:57 ` Tomasz Figa
1 sibling, 1 reply; 6+ messages in thread
From: Linus Walleij @ 2013-06-17 11:25 UTC (permalink / raw)
To: Sachin Kamat
Cc: linux-kernel, linux-samsung-soc, Patch Tracking, Doug Anderson
On Mon, Jun 17, 2013 at 11:38 AM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> 'exynos_wkup_irq_ack' should be defined ahead of its call.
>
> Fixes the following error:
> drivers/pinctrl/pinctrl-exynos.c: In function ‘exynos_wkup_irq_mask’:
> drivers/pinctrl/pinctrl-exynos.c:299:3: error: implicit declaration of
> function ‘exynos_wkup_irq_ack’ [-Werror=implicit-function-declaration]
> exynos_wkup_irq_ack(irqd);
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Doug Anderson <dianders@chromium.org>
> ---
> Fixed the commit message.
> ---
Applied.
Usually you should state which commit caused
the problem in the commit message.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH Resend] pinctrl: exynos: Fix build breakage
2013-06-17 11:25 ` Linus Walleij
@ 2013-06-17 11:46 ` Sachin Kamat
0 siblings, 0 replies; 6+ messages in thread
From: Sachin Kamat @ 2013-06-17 11:46 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-kernel, linux-samsung-soc, Patch Tracking, Doug Anderson
On 17 June 2013 16:55, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Mon, Jun 17, 2013 at 11:38 AM, Sachin Kamat <sachin.kamat@linaro.org> wrote:
>
>> 'exynos_wkup_irq_ack' should be defined ahead of its call.
>>
>> Fixes the following error:
>> drivers/pinctrl/pinctrl-exynos.c: In function ‘exynos_wkup_irq_mask’:
>> drivers/pinctrl/pinctrl-exynos.c:299:3: error: implicit declaration of
>> function ‘exynos_wkup_irq_ack’ [-Werror=implicit-function-declaration]
>> exynos_wkup_irq_ack(irqd);
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> Cc: Doug Anderson <dianders@chromium.org>
>> ---
>> Fixed the commit message.
>> ---
>
> Applied.
Thanks.
>
> Usually you should state which commit caused
> the problem in the commit message.
Usually I do. But in this case it was not caused by a single commit
per se but a combination.
Hence I wasn't sure if I should mention both as the ones causing it.
--
With warm regards,
Sachin
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH Resend] pinctrl: exynos: Fix build breakage
2013-06-17 9:38 [PATCH Resend] pinctrl: exynos: Fix build breakage Sachin Kamat
2013-06-17 11:25 ` Linus Walleij
@ 2013-06-17 11:57 ` Tomasz Figa
2013-06-17 16:18 ` Linus Walleij
1 sibling, 1 reply; 6+ messages in thread
From: Tomasz Figa @ 2013-06-17 11:57 UTC (permalink / raw)
To: Sachin Kamat, linus.walleij
Cc: linux-kernel, linux-samsung-soc, patches, Doug Anderson
Hi Sachin,
On Monday 17 of June 2013 15:08:12 Sachin Kamat wrote:
> 'exynos_wkup_irq_ack' should be defined ahead of its call.
>
> Fixes the following error:
> drivers/pinctrl/pinctrl-exynos.c: In function ‘exynos_wkup_irq_mask’:
> drivers/pinctrl/pinctrl-exynos.c:299:3: error: implicit declaration of
> function ‘exynos_wkup_irq_ack’ [-Werror=implicit-function-declaration]
> exynos_wkup_irq_ack(irqd);
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> Cc: Doug Anderson <dianders@chromium.org>
> ---
> Fixed the commit message.
> ---
This patch is incorrect.
Compilation error is caused by merge error of Doug's patch:
pinctrl: exynos: ack level-triggered interrupts before unmasking
hunk of which went to wrong function - mask instead of unmask.
Linus, could you fix it?
Best regards,
Tomasz
> drivers/pinctrl/pinctrl-exynos.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-exynos.c
> b/drivers/pinctrl/pinctrl-exynos.c index 8cd5bf5..f9277bc 100644
> --- a/drivers/pinctrl/pinctrl-exynos.c
> +++ b/drivers/pinctrl/pinctrl-exynos.c
> @@ -279,6 +279,15 @@ err_domains:
> return ret;
> }
>
> +static void exynos_wkup_irq_ack(struct irq_data *irqd)
> +{
> + struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd);
> + struct samsung_pinctrl_drv_data *d = b->drvdata;
> + unsigned long pend = d->ctrl->weint_pend + b->eint_offset;
> +
> + writel(1 << irqd->hwirq, d->virt_base + pend);
> +}
> +
> static void exynos_wkup_irq_mask(struct irq_data *irqd)
> {
> struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd);
> @@ -307,15 +316,6 @@ static void exynos_wkup_irq_mask(struct irq_data *irqd)
> spin_unlock_irqrestore(&b->slock, flags);
> }
>
> -static void exynos_wkup_irq_ack(struct irq_data *irqd)
> -{
> - struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd);
> - struct samsung_pinctrl_drv_data *d = b->drvdata;
> - unsigned long pend = d->ctrl->weint_pend + b->eint_offset;
> -
> - writel(1 << irqd->hwirq, d->virt_base + pend);
> -}
> -
> static void exynos_wkup_irq_unmask(struct irq_data *irqd)
> {
> struct samsung_pin_bank *b = irq_data_get_irq_chip_data(irqd);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH Resend] pinctrl: exynos: Fix build breakage
2013-06-17 11:57 ` Tomasz Figa
@ 2013-06-17 16:18 ` Linus Walleij
2013-06-17 16:51 ` Doug Anderson
0 siblings, 1 reply; 6+ messages in thread
From: Linus Walleij @ 2013-06-17 16:18 UTC (permalink / raw)
To: Tomasz Figa
Cc: Sachin Kamat, linux-kernel, linux-samsung-soc, Patch Tracking,
Doug Anderson
On Mon, Jun 17, 2013 at 1:57 PM, Tomasz Figa <t.figa@samsung.com> wrote:
> On Monday 17 of June 2013 15:08:12 Sachin Kamat wrote:
>> 'exynos_wkup_irq_ack' should be defined ahead of its call.
>>
>> Fixes the following error:
>> drivers/pinctrl/pinctrl-exynos.c: In function ‘exynos_wkup_irq_mask’:
>> drivers/pinctrl/pinctrl-exynos.c:299:3: error: implicit declaration of
>> function ‘exynos_wkup_irq_ack’ [-Werror=implicit-function-declaration]
>> exynos_wkup_irq_ack(irqd);
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> Cc: Doug Anderson <dianders@chromium.org>
>> ---
>> Fixed the commit message.
>> ---
>
> This patch is incorrect.
>
> Compilation error is caused by merge error of Doug's patch:
>
> pinctrl: exynos: ack level-triggered interrupts before unmasking
>
> hunk of which went to wrong function - mask instead of unmask.
OK probably I just had git am fail on me and used
patch -p1 < ...
> Linus, could you fix it?
No I'm afraid I will cause more trouble.
I took out Doug's commit and this fi from my tree.
Doug, can you respin the patch
"pinctrl: exynos: ack level-triggered interrupts before unmasking"
On top of my "devel" branch?
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH Resend] pinctrl: exynos: Fix build breakage
2013-06-17 16:18 ` Linus Walleij
@ 2013-06-17 16:51 ` Doug Anderson
0 siblings, 0 replies; 6+ messages in thread
From: Doug Anderson @ 2013-06-17 16:51 UTC (permalink / raw)
To: Linus Walleij
Cc: Tomasz Figa, Sachin Kamat, linux-kernel, linux-samsung-soc,
Patch Tracking
Linus,
On Mon, Jun 17, 2013 at 9:18 AM, Linus Walleij <linus.walleij@linaro.org> wrote:
> On Mon, Jun 17, 2013 at 1:57 PM, Tomasz Figa <t.figa@samsung.com> wrote:
>> On Monday 17 of June 2013 15:08:12 Sachin Kamat wrote:
>>> 'exynos_wkup_irq_ack' should be defined ahead of its call.
>>>
>>> Fixes the following error:
>>> drivers/pinctrl/pinctrl-exynos.c: In function ‘exynos_wkup_irq_mask’:
>>> drivers/pinctrl/pinctrl-exynos.c:299:3: error: implicit declaration of
>>> function ‘exynos_wkup_irq_ack’ [-Werror=implicit-function-declaration]
>>> exynos_wkup_irq_ack(irqd);
>>>
>>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>>> Cc: Doug Anderson <dianders@chromium.org>
>>> ---
>>> Fixed the commit message.
>>> ---
>>
>> This patch is incorrect.
>>
>> Compilation error is caused by merge error of Doug's patch:
>>
>> pinctrl: exynos: ack level-triggered interrupts before unmasking
>>
>> hunk of which went to wrong function - mask instead of unmask.
>
> OK probably I just had git am fail on me and used
> patch -p1 < ...
>
>> Linus, could you fix it?
>
> No I'm afraid I will cause more trouble.
>
> I took out Doug's commit and this fi from my tree.
>
> Doug, can you respin the patch
> "pinctrl: exynos: ack level-triggered interrupts before unmasking"
>
> On top of my "devel" branch?
OK, sent. :)
-Doug
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-06-17 16:51 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-17 9:38 [PATCH Resend] pinctrl: exynos: Fix build breakage Sachin Kamat
2013-06-17 11:25 ` Linus Walleij
2013-06-17 11:46 ` Sachin Kamat
2013-06-17 11:57 ` Tomasz Figa
2013-06-17 16:18 ` Linus Walleij
2013-06-17 16:51 ` Doug Anderson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®