2013-07-15 08:13:00

by Jean-Francois Moine

Subject: [PATCH] pinctrl: pinctrl-single: fix compile warning when no CONFIG_PM

This warning has been introduced by the commit
0f9bc4bcdf4f pinctrl: single: adopt pinctrl sleep mode management

Signed-off-by: Jean-Francois Moine <[email protected]>
---
drivers/pinctrl/pinctrl-single.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
index 6866548..7323cca 100644
--- a/drivers/pinctrl/pinctrl-single.c
+++ b/drivers/pinctrl/pinctrl-single.c
@@ -1483,6 +1483,7 @@ static int pcs_add_gpio_func(struct device_node *node, struct pcs_device *pcs)
return ret;
}

+#ifdef CONFIG_PM
static int pinctrl_single_suspend(struct platform_device *pdev,
pm_message_t state)
{
@@ -1505,6 +1506,7 @@ static int pinctrl_single_resume(struct platform_device *pdev)

return pinctrl_force_default(pcs->pctl);
}
+#endif

static int pcs_probe(struct platform_device *pdev)
{

2013-07-15 14:51:16

by Tony Lindgren

Subject: Re: [PATCH] pinctrl: pinctrl-single: fix compile warning when no CONFIG_PM

* Jean-Francois Moine <[email protected]> [130715 01:19]:
> This warning has been introduced by the commit
> 0f9bc4bcdf4f pinctrl: single: adopt pinctrl sleep mode management
>
> Signed-off-by: Jean-Francois Moine <[email protected]>

Acked-by: Tony Lindgren <[email protected]>

> ---
> drivers/pinctrl/pinctrl-single.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c
> index 6866548..7323cca 100644
> --- a/drivers/pinctrl/pinctrl-single.c
> +++ b/drivers/pinctrl/pinctrl-single.c
> @@ -1483,6 +1483,7 @@ static int pcs_add_gpio_func(struct device_node *node, struct pcs_device *pcs)
> return ret;
> }
>
> +#ifdef CONFIG_PM
> static int pinctrl_single_suspend(struct platform_device *pdev,
> pm_message_t state)
> {
> @@ -1505,6 +1506,7 @@ static int pinctrl_single_resume(struct platform_device *pdev)
>
> return pinctrl_force_default(pcs->pctl);
> }
> +#endif
>
> static int pcs_probe(struct platform_device *pdev)
> {
>

2013-07-22 21:01:45

by Linus Walleij

Subject: Re: [PATCH] pinctrl: pinctrl-single: fix compile warning when no CONFIG_PM

On Mon, Jul 15, 2013 at 10:14 AM, Jean-Francois Moine <[email protected]> wrote:

> This warning has been introduced by the commit
> 0f9bc4bcdf4f pinctrl: single: adopt pinctrl sleep mode management
>
> Signed-off-by: Jean-Francois Moine <[email protected]>

Patch applied with Tony's ACK.

Yours,
Linus Walleij