Home » Mailing list archives » linux-kernel » 2010 » December » 28

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

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Sundar R IYER
Subject: RE: linux-next: build failure after merge of the final tree (ux500-core tree related)
Date: Tuesday, December 28, 2010 - 4:13 am

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!

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
linux-next: build failure after merge of the final tree (u ..., Stephen Rothwell, (Thu Dec 23, 4:36 am)
Re: linux-next: build failure after merge of the final tre ..., Stephen Rothwell, (Sun Dec 26, 10:20 pm)
Re: linux-next: build failure after merge of the final tre ..., Linus Walleij, (Mon Dec 27, 5:29 pm)
RE: linux-next: build failure after merge of the final tre ..., Sundar R IYER, (Tue Dec 28, 4:13 am)
Re: linux-next: build failure after merge of the final tre ..., Linus Walleij, (Wed Dec 29, 2:29 pm)