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/
[ message continues ]

Hi all,


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/
[ message continues ]

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

[ message continues ]

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 ...
[ message continues ]

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

[ message continues ]