2020-10-29 09:03:29

by Coiby Xu

Subject: [PATCH 1/5] i2c: qup: remove unnecessary CONFIG_PM_SLEEP

SET_SYSTEM_SLEEP_PM_OPS has already took good care of CONFIG_PM_CONFIG.

Signed-off-by: Coiby Xu <[email protected]>
---
drivers/i2c/busses/i2c-qup.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c
index fbc04b60cfd1..bf63e4567705 100644
--- a/drivers/i2c/busses/i2c-qup.c
+++ b/drivers/i2c/busses/i2c-qup.c
@@ -1940,7 +1940,6 @@ static int qup_i2c_pm_resume_runtime(struct device *device)
}
#endif

-#ifdef CONFIG_PM_SLEEP
static int qup_i2c_suspend(struct device *device)
{
if (!pm_runtime_suspended(device))
@@ -1955,7 +1954,6 @@ static int qup_i2c_resume(struct device *device)
pm_request_autosuspend(device);
return 0;
}
-#endif

static const struct dev_pm_ops qup_i2c_qup_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(
--
2.28.0

2020-10-29 09:03:39

by Coiby Xu

Subject: [PATCH 5/5] i2c: stm32: remove unnecessary CONFIG_PM_SLEEP

SET_SYSTEM_SLEEP_PM_OPS has already took good care of CONFIG_PM_CONFIG.

Signed-off-by: Coiby Xu <[email protected]>
---
drivers/i2c/busses/i2c-stm32f7.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
index f41f51a176a1..95ac9dfdf458 100644
--- a/drivers/i2c/busses/i2c-stm32f7.c
+++ b/drivers/i2c/busses/i2c-stm32f7.c
@@ -2262,7 +2262,6 @@ static int __maybe_unused stm32f7_i2c_runtime_resume(struct device *dev)
return 0;
}

-#ifdef CONFIG_PM_SLEEP
static int stm32f7_i2c_regs_backup(struct stm32f7_i2c_dev *i2c_dev)
{
int ret;
@@ -2356,7 +2355,6 @@ static int stm32f7_i2c_resume(struct device *dev)

return 0;
}
-#endif

static const struct dev_pm_ops stm32f7_i2c_pm_ops = {
SET_RUNTIME_PM_OPS(stm32f7_i2c_runtime_suspend,
--
2.28.0

2020-10-29 09:05:24

by Coiby Xu

Subject: [PATCH 4/5] i2c: nomadik: remove unnecessary CONFIG_PM_SLEEP

SET_LATE_SYSTEM_SLEEP_PM_OPS has already took good care of CONFIG_PM_CONFIG.

Signed-off-by: Coiby Xu <[email protected]>
---
drivers/i2c/busses/i2c-nomadik.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index d4b1b0865f67..cd0f9f92c913 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -873,7 +873,6 @@ static irqreturn_t i2c_irq_handler(int irq, void *arg)
return IRQ_HANDLED;
}

-#ifdef CONFIG_PM_SLEEP
static int nmk_i2c_suspend_late(struct device *dev)
{
int ret;
@@ -890,7 +889,6 @@ static int nmk_i2c_resume_early(struct device *dev)
{
return pm_runtime_force_resume(dev);
}
-#endif

#ifdef CONFIG_PM
static int nmk_i2c_runtime_suspend(struct device *dev)
--
2.28.0

2020-10-29 09:05:34

by Coiby Xu

Subject: [PATCH 3/5] i2c: brcmstb: remove unnecessary CONFIG_PM_SLEEP

SIMPLE_DEV_PM_OPS has already took good care of CONFIG_PM_CONFIG.

Signed-off-by: Coiby Xu <[email protected]>
---
drivers/i2c/busses/i2c-brcmstb.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
index d4e0a0f6732a..16f688e115be 100644
--- a/drivers/i2c/busses/i2c-brcmstb.c
+++ b/drivers/i2c/busses/i2c-brcmstb.c
@@ -713,7 +713,6 @@ static int brcmstb_i2c_remove(struct platform_device *pdev)
return 0;
}

-#ifdef CONFIG_PM_SLEEP
static int brcmstb_i2c_suspend(struct device *dev)
{
struct brcmstb_i2c_dev *i2c_dev = dev_get_drvdata(dev);
@@ -731,7 +730,6 @@ static int brcmstb_i2c_resume(struct device *dev)

return 0;
}
-#endif

static SIMPLE_DEV_PM_OPS(brcmstb_i2c_pm, brcmstb_i2c_suspend,
brcmstb_i2c_resume);
--
2.28.0

2020-10-29 11:34:06

by Fabrice Gasnier

Subject: Re: [PATCH 5/5] i2c: stm32: remove unnecessary CONFIG_PM_SLEEP

On 10/29/20 8:46 AM, Coiby Xu wrote:
> SET_SYSTEM_SLEEP_PM_OPS has already took good care of CONFIG_PM_CONFIG.
>
> Signed-off-by: Coiby Xu <[email protected]>
> ---
> drivers/i2c/busses/i2c-stm32f7.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
> index f41f51a176a1..95ac9dfdf458 100644
> --- a/drivers/i2c/busses/i2c-stm32f7.c
> +++ b/drivers/i2c/busses/i2c-stm32f7.c
> @@ -2262,7 +2262,6 @@ static int __maybe_unused stm32f7_i2c_runtime_resume(struct device *dev)
> return 0;
> }
>
> -#ifdef CONFIG_PM_SLEEP

Hi Coiby,

This generates warnings when building with W=1 and CONFIG_PM_SLEEP=n.
Could you please add also "__maybe_unused" for relevant routines below ?

> static int stm32f7_i2c_regs_backup(struct stm32f7_i2c_dev *i2c_dev)
^
e.g. insert: __maybe_unused

Best regards,
Fabrice
> {
> int ret;
> @@ -2356,7 +2355,6 @@ static int stm32f7_i2c_resume(struct device *dev)
>
> return 0;
> }
> -#endif
>
> static const struct dev_pm_ops stm32f7_i2c_pm_ops = {
> SET_RUNTIME_PM_OPS(stm32f7_i2c_runtime_suspend,
>

2020-10-29 14:35:03

by Coiby Xu

Subject: Re: [PATCH 5/5] i2c: stm32: remove unnecessary CONFIG_PM_SLEEP

Hi Fabrice,

On Thu, Oct 29, 2020 at 12:31:54PM +0100, Fabrice Gasnier wrote:
>On 10/29/20 8:46 AM, Coiby Xu wrote:
>> SET_SYSTEM_SLEEP_PM_OPS has already took good care of CONFIG_PM_CONFIG.
>>
>> Signed-off-by: Coiby Xu <[email protected]>
>> ---
>> drivers/i2c/busses/i2c-stm32f7.c | 2 --
>> 1 file changed, 2 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
>> index f41f51a176a1..95ac9dfdf458 100644
>> --- a/drivers/i2c/busses/i2c-stm32f7.c
>> +++ b/drivers/i2c/busses/i2c-stm32f7.c
>> @@ -2262,7 +2262,6 @@ static int __maybe_unused stm32f7_i2c_runtime_resume(struct device *dev)
>> return 0;
>> }
>>
>> -#ifdef CONFIG_PM_SLEEP
>
>Hi Coiby,
>
>This generates warnings when building with W=1 and CONFIG_PM_SLEEP=n.
>Could you please add also "__maybe_unused" for relevant routines below ?
>
>> static int stm32f7_i2c_regs_backup(struct stm32f7_i2c_dev *i2c_dev)
> ^
>e.g. insert: __maybe_unused
>

Thank you for the suggestion. I'll add "__maybe_unused" in v2.

>Best regards,
>Fabrice
>> {
>> int ret;
>> @@ -2356,7 +2355,6 @@ static int stm32f7_i2c_resume(struct device *dev)
>>
>> return 0;
>> }
>> -#endif
>>
>> static const struct dev_pm_ops stm32f7_i2c_pm_ops = {
>> SET_RUNTIME_PM_OPS(stm32f7_i2c_runtime_suspend,
>>

--
Best regards,
Coiby

2020-11-04 03:31:17

by Florian Fainelli

Subject: Re: [PATCH 3/5] i2c: brcmstb: remove unnecessary CONFIG_PM_SLEEP

On 10/29/2020 12:46 AM, Coiby Xu wrote:
> SIMPLE_DEV_PM_OPS has already took good care of CONFIG_PM_CONFIG.
>
> Signed-off-by: Coiby Xu <[email protected]>

You need to annotate brcmstb_i2c_suspend and brcmstb_i2c_resume with
__maybe_unused to avoid generating compiler warnings about unused
functions with CONFIG_PM_SLEEP disabled.
--
Florian

2020-11-05 14:07:39

by Linus Walleij

Subject: Re: [PATCH 4/5] i2c: nomadik: remove unnecessary CONFIG_PM_SLEEP

On Thu, Oct 29, 2020 at 8:47 AM Coiby Xu <[email protected]> wrote:

> SET_LATE_SYSTEM_SLEEP_PM_OPS has already took good care of CONFIG_PM_CONFIG.
>
> Signed-off-by: Coiby Xu <[email protected]>

I don't know about the state of sleep/pm callback macros, but I
assume you know what you're doing.
Acked-by: Linus Walleij <[email protected]>

Yours,
Linus Walleij