diff mbox

[Resend] pinctrl: exynos: Fix build breakage

Message ID 1371461892-5298-1-git-send-email-sachin.kamat@linaro.org
State Accepted
Headers show

Commit Message

Sachin Kamat June 17, 2013, 9:38 a.m. UTC
'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(-)

Comments

Linus Walleij June 17, 2013, 11:25 a.m. UTC | #1
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
Sachin Kamat June 17, 2013, 11:46 a.m. UTC | #2
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.
Tomasz Figa June 17, 2013, 11:57 a.m. UTC | #3
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);
Linus Walleij June 17, 2013, 4:18 p.m. UTC | #4
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
Doug Anderson June 17, 2013, 4:51 p.m. UTC | #5
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
diff mbox

Patch

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);