host: ehci-exynos: Convert to use the SET_SYSTEM_SLEEP_PM_OPS

PATCH In review Anand Moon 3 participants 12 messages Oct 9, 2016 – Oct 19, 2016

Subsystems (4)

USB Arm Samsung Exynos USB ehci driver USB ohci driver

lore

Share & tools

lore

Anand Moon

author

2016-10-09 14:34 UTC #0 lore raw

PATCH 1/2 host: ehci-exynos: Convert to use the SET_SYSTEM_SLEEP_PM_OPS

Move the ehci-exynos system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid them being build when not used. This also allows us to use the SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.

Signed-off-by Anand Moon <[email protected]>

---
 drivers/usb/host/ehci-exynos.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

drivers/usb/host/ehci-exynos.c +6 -8

index 42e5b66..1899900 100644
@@ -251,7 +251,7 @@ static int exynos_ehci_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int exynos_ehci_suspend(struct device *dev)
 {
 	struct usb_hcd *hcd = dev_get_drvdata(dev);

@@ -292,15 +292,13 @@ static int exynos_ehci_resume(struct device *dev)
 	ehci_resume(hcd, false);
 	return 0;
 }
-#else
-#define exynos_ehci_suspend	NULL
-#define exynos_ehci_resume	NULL
-#endif
 
 static const struct dev_pm_ops exynos_ehci_pm_ops = {
-	.suspend	= exynos_ehci_suspend,
-	.resume		= exynos_ehci_resume,
+	SET_SYSTEM_SLEEP_PM_OPS(exynos_ehci_suspend, exynos_ehci_resume)
 };
+#endif /* CONFIG_PM_SLEEP */
+
+#define DEV_PM_OPS IS_ENABLED(CONFIG_PM_SLEEP) ? &exynos_ehci_pm_ops : NULL
 
 #ifdef CONFIG_OF
 static const struct of_device_id exynos_ehci_match[] = {

@@ -317,7 +315,7 @@ static struct platform_driver exynos_ehci_driver = {
 	.shutdown	= usb_hcd_platform_shutdown,
 	.driver = {
 		.name	= "exynos-ehci",
-		.pm	= &exynos_ehci_pm_ops,
+		.pm	= DEV_PM_OPS,
 		.of_match_table = of_match_ptr(exynos_ehci_match),
 	}
 };

Signature · 1 line

2.7.4

Anand Moon

author

2016-10-09 14:34 UTC #1 lore raw

PATCH 2/2 host: ohci-exynos: Convert to use the SET_SYSTEM_SLEEP_PM_OPS

Move the ohci-exynos system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid them being build when not used. This also allows us to use the SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.

Signed-off-by Anand Moon <[email protected]>

---
 drivers/usb/host/ohci-exynos.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

drivers/usb/host/ohci-exynos.c +9 ~~-11~~

index 2cd105b..1764baa 100644
@@ -219,7 +219,7 @@ static void exynos_ohci_shutdown(struct platform_device *pdev)
 		hcd->driver->shutdown(hcd);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int exynos_ohci_suspend(struct device *dev)
 {
 	struct usb_hcd *hcd = dev_get_drvdata(dev);

@@ -256,18 +256,16 @@ static int exynos_ohci_resume(struct device *dev)
 
 	return 0;
 }
-#else
-#define exynos_ohci_suspend	NULL
-#define exynos_ohci_resume	NULL
-#endif
 
-static const struct ohci_driver_overrides exynos_overrides __initconst = {
-	.extra_priv_size =	sizeof(struct exynos_ohci_hcd),
+static const struct dev_pm_ops exynos_ohci_pm_ops = {
+	SET_SYSTEM_SLEEP_PM_OPS(exynos_ohci_suspend, exynos_ohci_resume)
 };
+#endif /* CONFIG_PM_SLEEP */
 
-static const struct dev_pm_ops exynos_ohci_pm_ops = {
-	.suspend	= exynos_ohci_suspend,
-	.resume		= exynos_ohci_resume,
+#define DEV_PM_OPS IS_ENABLED(CONFIG_PM_SLEEP) ? &exynos_ohci_pm_ops : NULL
+
+static const struct ohci_driver_overrides exynos_overrides __initconst = {
+	.extra_priv_size =	sizeof(struct exynos_ohci_hcd),
 };
 
 #ifdef CONFIG_OF

@@ -285,7 +283,7 @@ static struct platform_driver exynos_ohci_driver = {
 	.shutdown	= exynos_ohci_shutdown,
 	.driver = {
 		.name	= "exynos-ohci",
-		.pm	= &exynos_ohci_pm_ops,
+		.pm	= DEV_PM_OPS,
 		.of_match_table	= of_match_ptr(exynos_ohci_match),
 	}
 };

Signature · 1 line

2.7.4

Krzysztof Kozlowski

maintainer

2016-10-09 16:34 UTC #2 lore raw

In reply to Anand Moon

Quoted 14 lines · Anand Moon

Move the ehci-exynos system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid them being build when not used. This also allows us to use the SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.
Signed-off-by Anand Moon <[email protected]>
---
 drivers/usb/host/ehci-exynos.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/usb/host/ehci-exynos.c +0 -0
index 42e5b66..1899900 100644

drivers/usb/host/ehci-exynos.c static int exynos_ehci_remove(struct platform_device *pdev) · line 254

Quoted 5 lines

drivers/usb/host/ehci-exynos.c +1 -1

@@ -251,7 +251,7 @@ static int exynos_ehci_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP

Does not look like an equivalent change. How will it behave in a config with !SUSPEND && !HIBERNATE && PM?

Best regards,
Krzysztof

Quoted 35 lines

drivers/usb/host/ehci-exynos.c +5 -7

 static int exynos_ehci_suspend(struct device *dev)
 {
 	struct usb_hcd *hcd = dev_get_drvdata(dev);

@@ -292,15 +292,13 @@ static int exynos_ehci_resume(struct device *dev)
 	ehci_resume(hcd, false);
 	return 0;
 }
-#else
-#define exynos_ehci_suspend	NULL
-#define exynos_ehci_resume	NULL
-#endif
 
 static const struct dev_pm_ops exynos_ehci_pm_ops = {
-	.suspend	= exynos_ehci_suspend,
-	.resume		= exynos_ehci_resume,
+	SET_SYSTEM_SLEEP_PM_OPS(exynos_ehci_suspend, exynos_ehci_resume)
 };
+#endif /* CONFIG_PM_SLEEP */
+
+#define DEV_PM_OPS IS_ENABLED(CONFIG_PM_SLEEP) ? &exynos_ehci_pm_ops : NULL
 
 #ifdef CONFIG_OF
 static const struct of_device_id exynos_ehci_match[] = {

@@ -317,7 +315,7 @@ static struct platform_driver exynos_ehci_driver = {
 	.shutdown	= usb_hcd_platform_shutdown,
 	.driver = {
 		.name	= "exynos-ehci",
-		.pm	= &exynos_ehci_pm_ops,
+		.pm	= DEV_PM_OPS,
 		.of_match_table = of_match_ptr(exynos_ehci_match),
 	}
 };

Signature · 1 line

2.7.4

Anand Moon

author

2016-10-09 17:15 UTC #3 lore raw

Hi Krzysztof,

Quoted 18 lines · Krzysztof Kozlowski

Quoted 17 lines · Anand Moon
Move the ehci-exynos system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid them being build when not used. This also allows us to use the SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.
Signed-off-by Anand Moon <[email protected]>
---
 drivers/usb/host/ehci-exynos.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/usb/host/ehci-exynos.c +0 -0
index 42e5b66..1899900 100644
@@ -251,7 +251,7 @@ static int exynos_ehci_remove(struct platform_device *pdev)
      return 0;
 }
 

Quoted 6 lines

drivers/usb/host/ehci-exynos.c static int exynos_ehci_remove(struct platform_device *pdev) · line 254
Quoted 2 lines
drivers/usb/host/ehci-exynos.c +1 -1
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
Does not look like an equivalent change. How will it behave in a config with !SUSPEND && !HIBERNATE && PM?

[snip]

I just wanted to update suspend and resume callback to use SET_SYSTEM_SLEEP_PM_OPS
as they are define under CONFIG_PM_SLEEP so I update above to avoid compilation warning/error.

http://lxr.free-electrons.com/source/include/linux/pm.h#L321

-Best Regards
Anand Moon

Krzysztof Kozlowski

maintainer

2016-10-09 17:27 UTC #4 lore raw

Quoted 28 lines · Anand Moon

Hi Krzysztof,
Quoted 18 lines · Krzysztof Kozlowski
Quoted 17 lines · Anand Moon
Move the ehci-exynos system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid them being build when not used. This also allows us to use the SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.
Signed-off-by Anand Moon <[email protected]>
---
 drivers/usb/host/ehci-exynos.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/usb/host/ehci-exynos.c +0 -0
index 42e5b66..1899900 100644
@@ -251,7 +251,7 @@ static int exynos_ehci_remove(struct platform_device *pdev)
      return 0;
 }
 
Quoted 6 lines
drivers/usb/host/ehci-exynos.c static int exynos_ehci_remove(struct platform_device *pdev) · line 254
Quoted 2 lines
drivers/usb/host/ehci-exynos.c +1 -1
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
Does not look like an equivalent change. How will it behave in a config with !SUSPEND && !HIBERNATE && PM?

Quoted 6 lines

[snip]
I just wanted to update suspend and resume callback to use SET_SYSTEM_SLEEP_PM_OPS
as they are define under CONFIG_PM_SLEEP so I update above to avoid compilation warning/error.

First of all you did not answer to my question, so let me rephrase into two:
1. Is the code equivalent?
2. What will be the output with !SUSPEND && !HIBERNATE && PM?

You didn't mention compilation warning/error in message commit so I do not know what you are thinking about...

Best regards,
Krzysztof

Anand Moon

author

2016-10-09 18:27 UTC #5 lore raw

hi Krzysztof,

Quoted 29 lines · Krzysztof Kozlowski

Quoted 28 lines · Anand Moon
Hi Krzysztof,
Quoted 24 lines · Krzysztof Kozlowski
Quoted 14 lines · Anand Moon
Move the ehci-exynos system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid them being build when not used. This also allows us to use the SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.
Signed-off-by Anand Moon <[email protected]>
---
 drivers/usb/host/ehci-exynos.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/usb/host/ehci-exynos.c +0 -0
index 42e5b66..1899900 100644
drivers/usb/host/ehci-exynos.c static int exynos_ehci_remove(struct platform_device *pdev) · line 254
Quoted 5 lines
drivers/usb/host/ehci-exynos.c +1 -1
@@ -251,7 +251,7 @@ static int exynos_ehci_remove(struct platform_device *pdev)
      return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
Does not look like an equivalent change. How will it behave in a config with !SUSPEND && !HIBERNATE && PM?

Quoted 7 lines

Quoted 6 lines
[snip]
I just wanted to update suspend and resume callback to use SET_SYSTEM_SLEEP_PM_OPS
as they are define under CONFIG_PM_SLEEP so I update above to avoid compilation warning/error.

Apologize: for not understanding your question.

Quoted 3 lines

First of all you did not answer to my question, so let me rephrase into two:
1. Is the code equivalent?

No CONFIG_PM and CONFIG_PM_SLEEP are different options.
But I could not disable CONFIG_PM_SLEEP option with either in exynos_defconfig

CONFIG_PM_SLEEP=n or
# CONFIG_PM_SLEEP is not set

Quoted 1 line

2. What will be the output with !SUSPEND && !HIBERNATE && PM?

#
# Power management options
#
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM is not set

When CONFIG_SUSPEND and CONFIG_HIBERNATION are not set CONFIG_PM is disabled and so is CONFIG_PM_SLEEP.

Best Regards
-Anand Moon

Quoted 6 lines

You didn't mention compilation warning/error in message commit so I do not know what you are thinking about...
Best regards,
Krzysztof

Krzysztof Kozlowski

maintainer

2016-10-09 18:39 UTC #6 lore raw

Quoted 39 lines · Anand Moon

hi Krzysztof,
Quoted 29 lines · Krzysztof Kozlowski
Quoted 28 lines · Anand Moon
Hi Krzysztof,
Quoted 24 lines · Krzysztof Kozlowski
Quoted 14 lines · Anand Moon
Move the ehci-exynos system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid them being build when not used. This also allows us to use the SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.
Signed-off-by Anand Moon <[email protected]>
---
 drivers/usb/host/ehci-exynos.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/usb/host/ehci-exynos.c +0 -0
index 42e5b66..1899900 100644
drivers/usb/host/ehci-exynos.c static int exynos_ehci_remove(struct platform_device *pdev) · line 254
Quoted 5 lines
drivers/usb/host/ehci-exynos.c +1 -1
@@ -251,7 +251,7 @@ static int exynos_ehci_remove(struct platform_device *pdev)
      return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
Does not look like an equivalent change. How will it behave in a config with !SUSPEND && !HIBERNATE && PM?
Quoted 7 lines
Quoted 6 lines
[snip]
I just wanted to update suspend and resume callback to use SET_SYSTEM_SLEEP_PM_OPS
as they are define under CONFIG_PM_SLEEP so I update above to avoid compilation warning/error.

Quoted 8 lines

Apologize: for not understanding your question.
Quoted 3 lines
First of all you did not answer to my question, so let me rephrase into two:
1. Is the code equivalent?
No CONFIG_PM and CONFIG_PM_SLEEP are different options.
But I could not disable CONFIG_PM_SLEEP option with either in exynos_defconfig

So the code is not equivalent...

Quoted 13 lines

CONFIG_PM_SLEEP=n or
# CONFIG_PM_SLEEP is not set
Quoted 1 line
2. What will be the output with !SUSPEND && !HIBERNATE && PM?
#
# Power management options
#
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM is not set

Quoted 2 lines

When CONFIG_SUSPEND and CONFIG_HIBERNATION are not set CONFIG_PM is disabled and so is CONFIG_PM_SLEEP.

In my config, the CONFIG_PM was enabled thus the code changes the functionality... Maybe this was intented but I really don't get it from the commit message or from your explanations here.

Krzysztof

Anand Moon

author

2016-10-09 19:01 UTC #7 lore raw

hi Krzysztof,

Quoted 64 lines · Krzysztof Kozlowski

Quoted 39 lines · Anand Moon
hi Krzysztof,
Quoted 29 lines · Krzysztof Kozlowski
Quoted 28 lines · Anand Moon
Hi Krzysztof,
Quoted 24 lines · Krzysztof Kozlowski
Quoted 14 lines · Anand Moon
Move the ehci-exynos system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid them being build when not used. This also allows us to use the SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.
Signed-off-by Anand Moon <[email protected]>
---
 drivers/usb/host/ehci-exynos.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/usb/host/ehci-exynos.c +0 -0
index 42e5b66..1899900 100644
drivers/usb/host/ehci-exynos.c static int exynos_ehci_remove(struct platform_device *pdev) · line 254
Quoted 5 lines
drivers/usb/host/ehci-exynos.c +1 -1
@@ -251,7 +251,7 @@ static int exynos_ehci_remove(struct platform_device *pdev)
      return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
Does not look like an equivalent change. How will it behave in a config with !SUSPEND && !HIBERNATE && PM?
Quoted 7 lines
Quoted 6 lines
[snip]
I just wanted to update suspend and resume callback to use SET_SYSTEM_SLEEP_PM_OPS
as they are define under CONFIG_PM_SLEEP so I update above to avoid compilation warning/error.
Quoted 8 lines
Apologize: for not understanding your question.
Quoted 3 lines
First of all you did not answer to my question, so let me rephrase into two:
1. Is the code equivalent?
No CONFIG_PM and CONFIG_PM_SLEEP are different options.
But I could not disable CONFIG_PM_SLEEP option with either in exynos_defconfig
So the code is not equivalent...
Quoted 13 lines
CONFIG_PM_SLEEP=n or
# CONFIG_PM_SLEEP is not set
Quoted 1 line
2. What will be the output with !SUSPEND && !HIBERNATE && PM?
#
# Power management options
#
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM is not set

Quoted 8 lines

Quoted 2 lines
When CONFIG_SUSPEND and CONFIG_HIBERNATION are not set CONFIG_PM is disabled and so is CONFIG_PM_SLEEP.
In my config, the CONFIG_PM was enabled thus the code changes the functionality... Maybe this was intented but I really don't get it from the commit message or from your explanations here.
Krzysztof

Ok I will keep the changes to use CONFIG_PM, but use the SET_SYSTEM_SLEEP_PM_OPS option in V2 patch. Is that ok.

-Best Regards
-Anand Moon

Anand Moon

author

2016-10-19 16:43 UTC #8 lore raw

In reply to Krzysztof Kozlowski

Hi Krzysztof,

Quoted 42 lines · Krzysztof Kozlowski

Quoted 41 lines · Anand Moon
hi Krzysztof,
Quoted 29 lines · Krzysztof Kozlowski
Quoted 28 lines · Anand Moon
Hi Krzysztof,
Quoted 24 lines · Krzysztof Kozlowski
Quoted 14 lines · Anand Moon
Move the ehci-exynos system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid them being build when not used. This also allows us to use the SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.
Signed-off-by Anand Moon <[email protected]>
---
 drivers/usb/host/ehci-exynos.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/usb/host/ehci-exynos.c +0 -0
index 42e5b66..1899900 100644
drivers/usb/host/ehci-exynos.c static int exynos_ehci_remove(struct platform_device *pdev) · line 254
Quoted 5 lines
drivers/usb/host/ehci-exynos.c +1 -1
@@ -251,7 +251,7 @@ static int exynos_ehci_remove(struct platform_device *pdev)
      return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
Does not look like an equivalent change. How will it behave in a config with !SUSPEND && !HIBERNATE && PM?
Quoted 7 lines
Quoted 6 lines
[snip]
I just wanted to update suspend and resume callback to use SET_SYSTEM_SLEEP_PM_OPS
as they are define under CONFIG_PM_SLEEP so I update above to avoid compilation warning/error.
Apologize: for not understanding your question.

Quoted 8 lines

Quoted 6 lines
Quoted 3 lines
First of all you did not answer to my question, so let me rephrase into two:
1. Is the code equivalent?
No CONFIG_PM and CONFIG_PM_SLEEP are different options.
But I could not disable CONFIG_PM_SLEEP option with either in exynos_defconfig
So the code is not equivalent...

I might be wrong, below is the kconfig option for PM_SLEEP

Symbol: PM_SLEEP [=y]
Type : boolean
Defined at kernel/power/Kconfig
Depends on: SUSPEND [=y] || HIBERNATE_CALLBACKS [=n]
Selects: PM [=y]

So we cannot set CONFIG_PM_SLEEP=n and CONFIG_PM=y

I observed at many places were either CONFIG_PM or CONFIG_PM_SLEEP are used.

So I would like to use SIMPLE_DEV_PM_OPS macro to set struct dev_pm_ops exynos_ohci_pm_ops to correct the code.

Best Regards
-Anand Moon

Quoted 22 lines

Quoted 14 lines
CONFIG_PM_SLEEP=n or
# CONFIG_PM_SLEEP is not set
Quoted 1 line
2. What will be the output with !SUSPEND && !HIBERNATE && PM?
#
# Power management options
#
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM is not set
Quoted 2 lines
When CONFIG_SUSPEND and CONFIG_HIBERNATION are not set CONFIG_PM is disabled and so is CONFIG_PM_SLEEP.
In my config, the CONFIG_PM was enabled thus the code changes the functionality... Maybe this was intented but I really don't get it from the commit message or from your explanations here.
Krzysztof

Alan Stern

maintainer

2016-10-19 17:34 UTC #9 lore raw

Quoted 9 lines · Anand Moon

I might be wrong, below is the kconfig option for PM_SLEEP
Symbol: PM_SLEEP [=y]
Type : boolean
Defined at kernel/power/Kconfig
Depends on: SUSPEND [=y] || HIBERNATE_CALLBACKS [=n]
Selects: PM [=y]
So we cannot set CONFIG_PM_SLEEP=n and CONFIG_PM=y

You have it backward. We cannot set CONFIG_PM_SLEEP=y and CONFIG_PM=n. But you can have CONFIG_PM_SLEEP=n and CONFIG_PM=y.

Alan Stern

Quoted 32 lines

I observed at many places were either CONFIG_PM or CONFIG_PM_SLEEP are used.
So I would like to use SIMPLE_DEV_PM_OPS macro to set struct dev_pm_ops exynos_ohci_pm_ops to correct the code.
Best Regards
-Anand Moon
Quoted 22 lines
Quoted 14 lines
CONFIG_PM_SLEEP=n or
# CONFIG_PM_SLEEP is not set
Quoted 1 line
2. What will be the output with !SUSPEND && !HIBERNATE && PM?
#
# Power management options
#
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM is not set
Quoted 2 lines
When CONFIG_SUSPEND and CONFIG_HIBERNATION are not set CONFIG_PM is disabled and so is CONFIG_PM_SLEEP.
In my config, the CONFIG_PM was enabled thus the code changes the functionality... Maybe this was intented but I really don't get it from the commit message or from your explanations here.
Krzysztof

Alan Stern

maintainer

2016-10-09 21:17 UTC #10 lore raw

In reply to Krzysztof Kozlowski

Quoted 18 lines · Krzysztof Kozlowski

Quoted 17 lines · Anand Moon
Move the ehci-exynos system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid them being build when not used. This also allows us to use the SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.
Signed-off-by Anand Moon <[email protected]>
---
 drivers/usb/host/ehci-exynos.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/usb/host/ehci-exynos.c +0 -0
index 42e5b66..1899900 100644
@@ -251,7 +251,7 @@ static int exynos_ehci_remove(struct platform_device *pdev)
 	return 0;
 }
 

Quoted 5 lines

drivers/usb/host/ehci-exynos.c static int exynos_ehci_remove(struct platform_device *pdev) · line 254
Quoted 2 lines
drivers/usb/host/ehci-exynos.c +1 -1
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
Does not look like an equivalent change. How will it behave in a config with !SUSPEND && !HIBERNATE && PM?

It's hard to say what Anand originally had in mind. To me, it looks like it will behave exactly the same as before, the only difference being that the object image will not contain unused exynos_ehci_suspend and exynos_ehci_resume routines. And the compiler won't issue a warning at build time that the routines are unused.

Alan Stern

Anand Moon

author

2016-10-10 14:16 UTC #11 lore raw

hi Alan/Krzysztof,

Quoted 26 lines · Alan Stern

Quoted 18 lines · Krzysztof Kozlowski
Quoted 17 lines · Anand Moon
Move the ehci-exynos system PM callbacks within #ifdef CONFIG_PM_SLEEP as to avoid them being build when not used. This also allows us to use the SET_SYSTEM_SLEEP_PM_OPS macro which simplifies the code.
Signed-off-by Anand Moon <[email protected]>
---
 drivers/usb/host/ehci-exynos.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
drivers/usb/host/ehci-exynos.c +0 -0
index 42e5b66..1899900 100644
@@ -251,7 +251,7 @@ static int exynos_ehci_remove(struct platform_device *pdev)
    return 0;
 }
 
Quoted 5 lines
drivers/usb/host/ehci-exynos.c static int exynos_ehci_remove(struct platform_device *pdev) · line 254
Quoted 2 lines
drivers/usb/host/ehci-exynos.c +1 -1
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
Does not look like an equivalent change. How will it behave in a config with !SUSPEND && !HIBERNATE && PM?

Quoted 8 lines

It's hard to say what Anand originally had in mind. To me, it looks like it will behave exactly the same as before, the only difference being that the object image will not contain unused exynos_ehci_suspend and exynos_ehci_resume routines. And the compiler won't issue a warning at build time that the routines are unused.
Alan Stern

Thanks for looking into this closely.

I will just send one line changes to use SET_SYSTEM_SLEEP_PM_OPS with better commit logs, if you people agree with this.

Best Regards
-Anand Moon