linux-next: build failure after merge of the final tree (ux500-core tree related)

linux-next: build failure after merge of the final tree (ux500-core tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1399 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc allyesconfig)
failed like this:

drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_enable':
drivers/input/keyboard/tc3589x-keypad.c:239: error: 'keypad' undeclared (first use in this function)
drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_disable':
drivers/input/keyboard/tc3589x-keypad.c:268: error: 'keypad' undeclared (first use in this function)
drivers/input/keyboard/tc3589x-keypad.c: At top level:
drivers/input/keyboard/tc3589x-keypad.c:448: error: expected ',' or ';' before 'static'
drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_init':
drivers/input/keyboard/tc3589x-keypad.c:460: error: 'tc3589x_keypad_driver' undeclared (first use in this function)
drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_exit':
drivers/input/keyboard/tc3589x-keypad.c:466: error: 'tc3589x_keypad_driver' undeclared (first use in this function)
drivers/input/keyboard/tc3589x-keypad.c:466: warning: 'return' with a value, in function returning void

Caused by commit 1967733650dac41c93954a187246c91430c4a94f
("input/tc3589x: add tc3589x keypad support").

I have not taken any action as I am not releasing linux-next today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the final tree (ux500-core tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1520 bytes --]

Hi all,

On Thu, 23 Dec 2010 22:36:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the final tree, today's linux-next build (powerpc allyesconfig)
> failed like this:
> 
> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_enable':
> drivers/input/keyboard/tc3589x-keypad.c:239: error: 'keypad' undeclared (first use in this function)
> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_disable':
> drivers/input/keyboard/tc3589x-keypad.c:268: error: 'keypad' undeclared (first use in this function)
> drivers/input/keyboard/tc3589x-keypad.c: At top level:
> drivers/input/keyboard/tc3589x-keypad.c:448: error: expected ',' or ';' before 'static'
> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_init':
> drivers/input/keyboard/tc3589x-keypad.c:460: error: 'tc3589x_keypad_driver' undeclared (first use in this function)
> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_exit':
> drivers/input/keyboard/tc3589x-keypad.c:466: error: 'tc3589x_keypad_driver' undeclared (first use in this function)
> drivers/input/keyboard/tc3589x-keypad.c:466: warning: 'return' with a value, in function returning void
> 
> Caused by commit 1967733650dac41c93954a187246c91430c4a94f
> ("input/tc3589x: add tc3589x keypad support").

This error is still there, so I reverted the above commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the final tree (ux500-core tree related)

[Linus Walleij]

2010/12/27 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi all,
>
> On Thu, 23 Dec 2010 22:36:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the final tree, today's linux-next build (powerpc allyesconfig)
>> failed like this:
>>
>> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_enable':
>> drivers/input/keyboard/tc3589x-keypad.c:239: error: 'keypad' undeclared (first use in this function)
>> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_disable':
>> drivers/input/keyboard/tc3589x-keypad.c:268: error: 'keypad' undeclared (first use in this function)
>> drivers/input/keyboard/tc3589x-keypad.c: At top level:
>> drivers/input/keyboard/tc3589x-keypad.c:448: error: expected ',' or ';' before 'static'
>> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_init':
>> drivers/input/keyboard/tc3589x-keypad.c:460: error: 'tc3589x_keypad_driver' undeclared (first use in this function)
>> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_exit':
>> drivers/input/keyboard/tc3589x-keypad.c:466: error: 'tc3589x_keypad_driver' undeclared (first use in this function)
>> drivers/input/keyboard/tc3589x-keypad.c:466: warning: 'return' with a value, in function returning void
>>
>> Caused by commit 1967733650dac41c93954a187246c91430c4a94f
>> ("input/tc3589x: add tc3589x keypad support").
>
> This error is still there, so I reverted the above commit for today.

Ooopsie, thanks for noticing. I've reverted this driver and pushed now.
This driver will likely have to wait for the next merge window.

Yours,
Linus Walleij

RE: linux-next: build failure after merge of the final tree (ux500-core tree related)

[Sundar R IYER]

Hi all,

Here is the patch which fixes this build issues. I am very sorry for the inconvenience caused.

>From 7338ad3039b3fbd3e20c8691c0bcf6f6fd614904 Mon Sep 17 00:00:00 2001
From: Sundar Iyer <sundar.iyer@stericsson.com>
Date: Tue, 28 Dec 2010 16:37:54 +0530
Subject: [PATCH] input/tc3589x-keypad: fix build issues

Signed-off-by: Sundar Iyer <sundar.iyer@stericsson.com>
---
 drivers/input/keyboard/tc3589x-keypad.c |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/input/keyboard/tc3589x-keypad.c b/drivers/input/keyboard/tcc
3589x-keypad.c
index e363b91..9d64d25 100644
--- a/drivers/input/keyboard/tc3589x-keypad.c
+++ b/drivers/input/keyboard/tc3589x-keypad.c
@@ -206,8 +206,9 @@ static irqreturn_t tc3589x_keypad_irq(int irq, void *dev)
        return IRQ_HANDLED;
 }

-static int tc3589x_keypad_enable(struct tc3589x *tc3589x)
+static int tc3589x_keypad_enable(struct tc_keypad *keypad)
 {
+       struct tc3589x *tc3589x = keypad->tc3589x;
        int ret;

        /* pull the keypad module out of reset */
@@ -241,8 +242,9 @@ static int tc3589x_keypad_enable(struct tc3589x *tc3589x)
        return ret;
 }

-static int tc3589x_keypad_disable(struct tc3589x *tc3589x)
+static int tc3589x_keypad_disable(struct tc_keypad *keypad)
 {
+       struct tc3589x *tc3589x = keypad->tc3589x;
        int ret;

        /* clear IRQ */
@@ -274,10 +276,9 @@ static int tc3589x_keypad_open(struct input_dev *input)
 {
        int error;
        struct tc_keypad *keypad = input_get_drvdata(input);
-       struct tc3589x *tc3589x = keypad->tc3589x;

        /* enable the keypad module */
-       error = tc3589x_keypad_enable(tc3589x);
+       error = tc3589x_keypad_enable(keypad);
        if (error < 0) {
                dev_err(&input->dev, "failed to enable keypad module\n");
                return error;
@@ -295,10 +296,9 @@ static int tc3589x_keypad_open(struct input_dev *input)
 static void tc3589x_keypad_close(struct input_dev *input)
 {
        struct tc_keypad *keypad = input_get_drvdata(input);
-       struct tc3589x *tc3589x = keypad->tc3589x;

        /* disable the keypad module */
-       tc3589x_keypad_disable(tc3589x);
+       tc3589x_keypad_disable(keypad);
 }

 static int __devinit tc3589x_keypad_probe(struct platform_device *pdev)
@@ -388,11 +388,10 @@ err_free_mem:
 static int __devexit tc3589x_keypad_remove(struct platform_device *pdev)
 {
        struct tc_keypad *keypad = platform_get_drvdata(pdev);
-       struct tc3589x *tc3589x = keypad->tc3589x;
        int irq = platform_get_irq(pdev, 0);

        if (!keypad->keypad_stopped)
-               tc3589x_keypad_disable(tc3589x);
+               tc3589x_keypad_disable(keypad);

        free_irq(irq, keypad);

@@ -407,7 +406,6 @@ static int tc3589x_keypad_suspend(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct tc_keypad *keypad = platform_get_drvdata(pdev);
-       struct tc3589x *tc3589x = keypad->tc3589x;
        int irq = platform_get_irq(pdev, 0);

        /* keypad is already off; we do nothing */
@@ -416,7 +414,7 @@ static int tc3589x_keypad_suspend(struct device *dev)

        /* if device is not a wakeup source, disable it for powersave */
        if (!device_may_wakeup(&pdev->dev))
-               tc3589x_keypad_disable(tc3589x);
+               tc3589x_keypad_disable(keypad);
        else
                enable_irq_wake(irq);

@@ -427,7 +425,6 @@ static int tc3589x_keypad_resume(struct device *dev)
 {
        struct platform_device *pdev = to_platform_device(dev);
        struct tc_keypad *keypad = platform_get_drvdata(pdev);
-       struct tc3589x *tc3589x = keypad->tc3589x;
        int irq = platform_get_irq(pdev, 0);

        if (!keypad->keypad_stopped)
@@ -435,15 +432,15 @@ static int tc3589x_keypad_resume(struct device *dev)

        /* enable the device to resume normal operations */
        if (!device_may_wakeup(&pdev->dev))
-               tc3589x_keypad_enable(tc3589x);
+               tc3589x_keypad_enable(keypad);
        else
                disable_irq_wake(irq);

        return 0;
 }

-static const SIMPLE_DEV_PM_OPS(tc3589x_keypad_dev_pm_ops, tc3589x_keypad_suspenn
d
-                               ,tc3589x_keypad_resume)
+static const SIMPLE_DEV_PM_OPS(tc3589x_keypad_dev_pm_ops,
+               tc3589x_keypad_suspend, tc3589x_keypad_resume);

 static struct platform_driver tc3589x_keypad_driver = {
        .driver.name  = "tc3589x-keypad",
--
1.7.2.dirty

Please let me know if you can include this patch now.

Cheers!

>-----Original Message-----
>From: Linus Walleij [mailto:linus.ml.walleij@gmail.com]
>Sent: Tuesday, December 28, 2010 6:00 AM
>To: Stephen Rothwell
>Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Sundar R IYER; Dmitry
>Torokhov
>Subject: Re: linux-next: build failure after merge of the final tree (ux500-core tree
>related)
>
>2010/12/27 Stephen Rothwell <sfr@canb.auug.org.au>:
>> Hi all,
>>
>> On Thu, 23 Dec 2010 22:36:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au>
>wrote:
>>>
>>> After merging the final tree, today's linux-next build (powerpc allyesconfig)
>>> failed like this:
>>>
>>> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_enable':
>>> drivers/input/keyboard/tc3589x-keypad.c:239: error: 'keypad' undeclared (first
>use in this function)
>>> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_disable':
>>> drivers/input/keyboard/tc3589x-keypad.c:268: error: 'keypad' undeclared (first
>use in this function)
>>> drivers/input/keyboard/tc3589x-keypad.c: At top level:
>>> drivers/input/keyboard/tc3589x-keypad.c:448: error: expected ',' or ';' before
>'static'
>>> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_init':
>>> drivers/input/keyboard/tc3589x-keypad.c:460: error: 'tc3589x_keypad_driver'
>undeclared (first use in this function)
>>> drivers/input/keyboard/tc3589x-keypad.c: In function 'tc3589x_keypad_exit':
>>> drivers/input/keyboard/tc3589x-keypad.c:466: error: 'tc3589x_keypad_driver'
>undeclared (first use in this function)
>>> drivers/input/keyboard/tc3589x-keypad.c:466: warning: 'return' with a value, in
>function returning void
>>>
>>> Caused by commit 1967733650dac41c93954a187246c91430c4a94f
>>> ("input/tc3589x: add tc3589x keypad support").
>>
>> This error is still there, so I reverted the above commit for today.
>
>Ooopsie, thanks for noticing. I've reverted this driver and pushed now.
>This driver will likely have to wait for the next merge window.
>
>Yours,
>Linus Walleij

Re: linux-next: build failure after merge of the final tree (ux500-core tree related)

[Linus Walleij]

2010/12/28 Sundar R IYER <sundar.iyer@stericsson.com>:

> Here is the patch which fixes this build issues. I am very sorry for the inconvenience caused.

Such things happen. This patch was badly whitespace mangled after som
experience with Outlook and/or Exchange, but I fixed it up anyway :-)

Yours,
Linus Walleij

linux-next: build failure after merge of the final tree (ux500-core tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1227 bytes --]

Hi all,

After merging the final tree, next-20110601 build (arm u8500_defconfig)
failed like this:

arch/arm/mach-ux500/clock-db8500.c:21:32: error: linux/gpio/nomadik.h: No such file or directory
arch/arm/mach-ux500/clock-db8500.c: In function 'clkout0_enable':
arch/arm/mach-ux500/clock-db8500.c:214: error: implicit declaration of function 'nmk_config_pin'
arch/arm/mach-ux500/clock-db8500.c:214: error: implicit declaration of function 'PIN_CFG'
arch/arm/mach-ux500/clock-db8500.c:214: error: 'ALT_A' undeclared (first use in this function)
arch/arm/mach-ux500/clock-db8500.c: In function 'clkout0_disable':
arch/arm/mach-ux500/clock-db8500.c:221: error: 'GPIO' undeclared (first use in this function)
arch/arm/mach-ux500/clock-db8500.c: In function 'clkout1_enable':
arch/arm/mach-ux500/clock-db8500.c:239: error: 'ALT_A' undeclared (first use in this function)
arch/arm/mach-ux500/clock-db8500.c: In function 'clkout1_disable':
arch/arm/mach-ux500/clock-db8500.c:246: error: 'GPIO' undeclared (first use in this function)

Casued by commit 077f17db54fa ("mach-ux500: split per-SoC clock trees").
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the final tree (ux500-core tree related)

[Linus Walleij]

2011/6/2 Stephen Rothwell <sfr@canb.auug.org.au>:

> After merging the final tree, next-20110601 build (arm u8500_defconfig)
> failed like this:

Oh crap, I thought that patch was independent but it wasn't. I'll
take it out.

Thanks for noticing this Stephen,
Linus Walleij