Dmitry Torokhov wrote:
> On Wed, Jul 22, 2009 at 11:30:44PM -0700, Dmitry Torokhov wrote:
>> On Tue, Jul 21, 2009 at 01:44:56PM +0300, Mike Rapoport wrote:
>>> Hi Dmitry,
>>>
>>> Dmitry Torokhov wrote:
>>>> Hi Eric,
>>>>
>>>> I made a few adjustments to the pxa27x_keypad driver and was wondering
>>>> if you would be able to give it a sping and check if I broke it or not.
>>> Apparently not :)
>>> Tested-by: Mike Rapoport <mike@xxxxxxxxxxxxxx>
>>>
>> Cool, thanks for testing. I have another one for you then ;)
>>
>> TIA!
>>
>
> Umm.. this one is hopefully better...
>
> Input: pxa27x_keypad - switch to using dev_pm_ops
>
> Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
I've got this with 2.6.31-rc3
CC drivers/input/keyboard/pxa27x_keypad.o
drivers/input/keyboard/pxa27x_keypad.c:591: warning: initialization discards
qualifiers from pointer target type
Except that
Acked-by: Mike Rapoport <mike@xxxxxxxxxxxxxx>
> ---
>
> drivers/input/keyboard/pxa27x_keypad.c | 19 ++++++++++++-------
> 1 files changed, 12 insertions(+), 7 deletions(-)
>
>
> diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
> index 0943238..c987cc7 100644
> --- a/drivers/input/keyboard/pxa27x_keypad.c
> +++ b/drivers/input/keyboard/pxa27x_keypad.c
> @@ -389,8 +389,9 @@ static void pxa27x_keypad_close(struct input_dev *dev)
> }
>
> #ifdef CONFIG_PM
> -static int pxa27x_keypad_suspend(struct platform_device *pdev, pm_message_t state)
> +static int pxa27x_keypad_suspend(struct device *dev)
> {
> + struct platform_device *pdev = to_platform_device(dev);
> struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
>
> clk_disable(keypad->clk);
> @@ -401,8 +402,9 @@ static int pxa27x_keypad_suspend(struct platform_device *pdev, pm_message_t stat
> return 0;
> }
>
> -static int pxa27x_keypad_resume(struct platform_device *pdev)
> +static int pxa27x_keypad_resume(struct device *dev)
> {
> + struct platform_device *pdev = to_platform_device(dev);
> struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
> struct input_dev *input_dev = keypad->input_dev;
>
> @@ -421,9 +423,11 @@ static int pxa27x_keypad_resume(struct platform_device *pdev)
>
> return 0;
> }
> -#else
> -#define pxa27x_keypad_suspend NULL
> -#define pxa27x_keypad_resume NULL
> +
> +static const struct dev_pm_ops pxa27x_keypad_pm_ops = {
> + .suspend = pxa27x_keypad_suspend,
> + .resume = pxa27x_keypad_resume,
> +};
> #endif
>
> static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
> @@ -572,11 +576,12 @@ MODULE_ALIAS("platform:pxa27x-keypad");
> static struct platform_driver pxa27x_keypad_driver = {
> .probe = pxa27x_keypad_probe,
> .remove = __devexit_p(pxa27x_keypad_remove),
> - .suspend = pxa27x_keypad_suspend,
> - .resume = pxa27x_keypad_resume,
> .driver = {
> .name = "pxa27x-keypad",
> .owner = THIS_MODULE,
> +#ifdef CONFIG_PM
> + .pm = &pxa27x_keypad_pm_ops,
> +#endif
> },
> };
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Sincerely yours,
Mike.
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
