* [PATCH 1/6] usb: dwc3: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-12-28 23:32 [PATCH 0/6] Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
@ 2024-12-28 23:32 ` Raphael Gallais-Pou
2024-12-28 23:32 ` [PATCH 2/6] mmc: sdhci-st: " Raphael Gallais-Pou
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Raphael Gallais-Pou @ 2024-12-28 23:32 UTC (permalink / raw)
To: Patrice Chotard, Thinh Nguyen, Greg Kroah-Hartman, Adrian Hunter,
Ulf Hansson, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Damien Le Moal, Niklas Cassel,
Alexandre Torgue, Jose Abreu, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin,
Mark Brown
Cc: linux-arm-kernel, linux-usb, linux-kernel, linux-mmc, linux-mtd,
linux-ide, netdev, linux-stm32, linux-spi
Letting the compiler remove these functions when the kernel is built
without CONFIG_PM_SLEEP support is simpler and less error prone than the
use of #ifdef based kernel configuration guards.
Link: https://lore.kernel.org/all/20240716180010.126987-1-rgallaispou@gmail.com
Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
---
drivers/usb/dwc3/dwc3-st.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-st.c b/drivers/usb/dwc3/dwc3-st.c
index e16c3237180e970c184dfdb147c8abd46ff429a3..ef7c43008946e15b72d88aba4941dc52bf0788d7 100644
--- a/drivers/usb/dwc3/dwc3-st.c
+++ b/drivers/usb/dwc3/dwc3-st.c
@@ -309,7 +309,6 @@ static void st_dwc3_remove(struct platform_device *pdev)
reset_control_assert(dwc3_data->rstc_rst);
}
-#ifdef CONFIG_PM_SLEEP
static int st_dwc3_suspend(struct device *dev)
{
struct st_dwc3 *dwc3_data = dev_get_drvdata(dev);
@@ -343,9 +342,8 @@ static int st_dwc3_resume(struct device *dev)
return 0;
}
-#endif /* CONFIG_PM_SLEEP */
-static SIMPLE_DEV_PM_OPS(st_dwc3_dev_pm_ops, st_dwc3_suspend, st_dwc3_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(st_dwc3_dev_pm_ops, st_dwc3_suspend, st_dwc3_resume);
static const struct of_device_id st_dwc3_match[] = {
{ .compatible = "st,stih407-dwc3" },
@@ -360,7 +358,7 @@ static struct platform_driver st_dwc3_driver = {
.driver = {
.name = "usb-st-dwc3",
.of_match_table = st_dwc3_match,
- .pm = &st_dwc3_dev_pm_ops,
+ .pm = pm_sleep_ptr(&st_dwc3_dev_pm_ops),
},
};
--
2.47.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/6] mmc: sdhci-st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-12-28 23:32 [PATCH 0/6] Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
2024-12-28 23:32 ` [PATCH 1/6] usb: dwc3: st: " Raphael Gallais-Pou
@ 2024-12-28 23:32 ` Raphael Gallais-Pou
2024-12-29 1:39 ` kernel test robot
2024-12-29 5:38 ` kernel test robot
2024-12-28 23:32 ` [PATCH 3/6] mtd: st_spi_fsm: " Raphael Gallais-Pou
` (4 subsequent siblings)
6 siblings, 2 replies; 13+ messages in thread
From: Raphael Gallais-Pou @ 2024-12-28 23:32 UTC (permalink / raw)
To: Patrice Chotard, Thinh Nguyen, Greg Kroah-Hartman, Adrian Hunter,
Ulf Hansson, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Damien Le Moal, Niklas Cassel,
Alexandre Torgue, Jose Abreu, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin,
Mark Brown
Cc: linux-arm-kernel, linux-usb, linux-kernel, linux-mmc, linux-mtd,
linux-ide, netdev, linux-stm32, linux-spi
Letting the compiler remove these functions when the kernel is built
without CONFIG_PM_SLEEP support is simpler and less error prone than the
use of #ifdef based kernel configuration guards.
Link: https://lore.kernel.org/all/20240716180010.126987-1-rgallaispou@gmail.com
Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
---
drivers/mmc/host/sdhci-st.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/sdhci-st.c b/drivers/mmc/host/sdhci-st.c
index 4973e08a98f87380325566a6b18878dd45e1dc30..901e431976ced68d5b6e374c2dec93c9fa821d38 100644
--- a/drivers/mmc/host/sdhci-st.c
+++ b/drivers/mmc/host/sdhci-st.c
@@ -447,7 +447,6 @@ static void sdhci_st_remove(struct platform_device *pdev)
reset_control_assert(rstc);
}
-#ifdef CONFIG_PM_SLEEP
static int sdhci_st_suspend(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
@@ -494,9 +493,8 @@ static int sdhci_st_resume(struct device *dev)
return sdhci_resume_host(host);
}
-#endif
-static SIMPLE_DEV_PM_OPS(sdhci_st_pmops, sdhci_st_suspend, sdhci_st_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(sdhci_st_pmops, sdhci_st_suspend, sdhci_st_resume);
static const struct of_device_id st_sdhci_match[] = {
{ .compatible = "st,sdhci" },
@@ -511,7 +509,7 @@ static struct platform_driver sdhci_st_driver = {
.driver = {
.name = "sdhci-st",
.probe_type = PROBE_PREFER_ASYNCHRONOUS,
- .pm = &sdhci_st_pmops,
+ .pm = pm_sleep_ptr(&sdhci_st_pmops),
.of_match_table = st_sdhci_match,
},
};
--
2.47.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 2/6] mmc: sdhci-st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-12-28 23:32 ` [PATCH 2/6] mmc: sdhci-st: " Raphael Gallais-Pou
@ 2024-12-29 1:39 ` kernel test robot
2024-12-29 5:38 ` kernel test robot
1 sibling, 0 replies; 13+ messages in thread
From: kernel test robot @ 2024-12-29 1:39 UTC (permalink / raw)
To: Raphael Gallais-Pou, Patrice Chotard, Thinh Nguyen,
Greg Kroah-Hartman, Adrian Hunter, Ulf Hansson, Miquel Raynal,
Richard Weinberger, Vignesh Raghavendra, Damien Le Moal,
Niklas Cassel, Alexandre Torgue, Jose Abreu, Andrew Lunn,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Maxime Coquelin, Mark Brown
Cc: llvm, oe-kbuild-all, netdev, linux-arm-kernel, linux-usb,
linux-kernel, linux-mmc, linux-mtd, linux-ide, linux-stm32,
linux-spi
Hi Raphael,
kernel test robot noticed the following build errors:
[auto build test ERROR on 8155b4ef3466f0e289e8fcc9e6e62f3f4dceeac2]
url: https://github.com/intel-lab-lkp/linux/commits/Raphael-Gallais-Pou/usb-dwc3-st-Switch-from-CONFIG_PM_SLEEP-guards-to-pm_sleep_ptr/20241229-073700
base: 8155b4ef3466f0e289e8fcc9e6e62f3f4dceeac2
patch link: https://lore.kernel.org/r/20241229-update_pm_macro-v1-2-c7d4c4856336%40gmail.com
patch subject: [PATCH 2/6] mmc: sdhci-st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
config: hexagon-randconfig-001-20241229 (https://download.01.org/0day-ci/archive/20241229/202412290939.43oNt9t6-lkp@intel.com/config)
compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project 319b89197348b7cad1215e235bdc7b5ec8f9b72c)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241229/202412290939.43oNt9t6-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202412290939.43oNt9t6-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/mmc/host/sdhci-st.c:460:8: error: call to undeclared function 'sdhci_suspend_host'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
460 | ret = sdhci_suspend_host(host);
| ^
>> drivers/mmc/host/sdhci-st.c:494:9: error: call to undeclared function 'sdhci_resume_host'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
494 | return sdhci_resume_host(host);
| ^
drivers/mmc/host/sdhci-st.c:494:9: note: did you mean 'sdhci_remove_host'?
drivers/mmc/host/sdhci.h:827:6: note: 'sdhci_remove_host' declared here
827 | void sdhci_remove_host(struct sdhci_host *host, int dead);
| ^
2 errors generated.
vim +/sdhci_suspend_host +460 drivers/mmc/host/sdhci-st.c
f52d9c4f459bda Peter Griffin 2014-07-09 449
f52d9c4f459bda Peter Griffin 2014-07-09 450 static int sdhci_st_suspend(struct device *dev)
f52d9c4f459bda Peter Griffin 2014-07-09 451 {
f52d9c4f459bda Peter Griffin 2014-07-09 452 struct sdhci_host *host = dev_get_drvdata(dev);
f52d9c4f459bda Peter Griffin 2014-07-09 453 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
1531675269c833 Jisheng Zhang 2016-02-16 454 struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host);
d38dcad4e7b48f Adrian Hunter 2017-03-20 455 int ret;
d38dcad4e7b48f Adrian Hunter 2017-03-20 456
d38dcad4e7b48f Adrian Hunter 2017-03-20 457 if (host->tuning_mode != SDHCI_TUNING_MODE_3)
d38dcad4e7b48f Adrian Hunter 2017-03-20 458 mmc_retune_needed(host->mmc);
f52d9c4f459bda Peter Griffin 2014-07-09 459
d38dcad4e7b48f Adrian Hunter 2017-03-20 @460 ret = sdhci_suspend_host(host);
f52d9c4f459bda Peter Griffin 2014-07-09 461 if (ret)
f52d9c4f459bda Peter Griffin 2014-07-09 462 goto out;
f52d9c4f459bda Peter Griffin 2014-07-09 463
406c24310a7bd7 Peter Griffin 2015-04-10 464 reset_control_assert(pdata->rstc);
406c24310a7bd7 Peter Griffin 2015-04-10 465
3ae50f4512ce83 Lee Jones 2016-09-08 466 clk_disable_unprepare(pdata->icnclk);
f52d9c4f459bda Peter Griffin 2014-07-09 467 clk_disable_unprepare(pltfm_host->clk);
f52d9c4f459bda Peter Griffin 2014-07-09 468 out:
f52d9c4f459bda Peter Griffin 2014-07-09 469 return ret;
f52d9c4f459bda Peter Griffin 2014-07-09 470 }
f52d9c4f459bda Peter Griffin 2014-07-09 471
f52d9c4f459bda Peter Griffin 2014-07-09 472 static int sdhci_st_resume(struct device *dev)
f52d9c4f459bda Peter Griffin 2014-07-09 473 {
f52d9c4f459bda Peter Griffin 2014-07-09 474 struct sdhci_host *host = dev_get_drvdata(dev);
f52d9c4f459bda Peter Griffin 2014-07-09 475 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
1531675269c833 Jisheng Zhang 2016-02-16 476 struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host);
2053812f6e1af0 Peter Griffin 2015-04-10 477 struct device_node *np = dev->of_node;
7f55eb101d4a75 Arvind Yadav 2017-06-20 478 int ret;
f52d9c4f459bda Peter Griffin 2014-07-09 479
7f55eb101d4a75 Arvind Yadav 2017-06-20 480 ret = clk_prepare_enable(pltfm_host->clk);
7f55eb101d4a75 Arvind Yadav 2017-06-20 481 if (ret)
7f55eb101d4a75 Arvind Yadav 2017-06-20 482 return ret;
7f55eb101d4a75 Arvind Yadav 2017-06-20 483
7f55eb101d4a75 Arvind Yadav 2017-06-20 484 ret = clk_prepare_enable(pdata->icnclk);
7f55eb101d4a75 Arvind Yadav 2017-06-20 485 if (ret) {
7f55eb101d4a75 Arvind Yadav 2017-06-20 486 clk_disable_unprepare(pltfm_host->clk);
7f55eb101d4a75 Arvind Yadav 2017-06-20 487 return ret;
7f55eb101d4a75 Arvind Yadav 2017-06-20 488 }
f52d9c4f459bda Peter Griffin 2014-07-09 489
406c24310a7bd7 Peter Griffin 2015-04-10 490 reset_control_deassert(pdata->rstc);
406c24310a7bd7 Peter Griffin 2015-04-10 491
2053812f6e1af0 Peter Griffin 2015-04-10 492 st_mmcss_cconfig(np, host);
2053812f6e1af0 Peter Griffin 2015-04-10 493
f52d9c4f459bda Peter Griffin 2014-07-09 @494 return sdhci_resume_host(host);
f52d9c4f459bda Peter Griffin 2014-07-09 495 }
f52d9c4f459bda Peter Griffin 2014-07-09 496
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 2/6] mmc: sdhci-st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-12-28 23:32 ` [PATCH 2/6] mmc: sdhci-st: " Raphael Gallais-Pou
2024-12-29 1:39 ` kernel test robot
@ 2024-12-29 5:38 ` kernel test robot
1 sibling, 0 replies; 13+ messages in thread
From: kernel test robot @ 2024-12-29 5:38 UTC (permalink / raw)
To: Raphael Gallais-Pou, Patrice Chotard, Thinh Nguyen,
Greg Kroah-Hartman, Adrian Hunter, Ulf Hansson, Miquel Raynal,
Richard Weinberger, Vignesh Raghavendra, Damien Le Moal,
Niklas Cassel, Alexandre Torgue, Jose Abreu, Andrew Lunn,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Maxime Coquelin, Mark Brown
Cc: oe-kbuild-all, netdev, linux-arm-kernel, linux-usb, linux-kernel,
linux-mmc, linux-mtd, linux-ide, linux-stm32, linux-spi
Hi Raphael,
kernel test robot noticed the following build errors:
[auto build test ERROR on 8155b4ef3466f0e289e8fcc9e6e62f3f4dceeac2]
url: https://github.com/intel-lab-lkp/linux/commits/Raphael-Gallais-Pou/usb-dwc3-st-Switch-from-CONFIG_PM_SLEEP-guards-to-pm_sleep_ptr/20241229-073700
base: 8155b4ef3466f0e289e8fcc9e6e62f3f4dceeac2
patch link: https://lore.kernel.org/r/20241229-update_pm_macro-v1-2-c7d4c4856336%40gmail.com
patch subject: [PATCH 2/6] mmc: sdhci-st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
config: s390-allyesconfig (https://download.01.org/0day-ci/archive/20241229/202412291320.lZkWz3Yv-lkp@intel.com/config)
compiler: s390-linux-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241229/202412291320.lZkWz3Yv-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202412291320.lZkWz3Yv-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/mmc/host/sdhci-st.c: In function 'sdhci_st_suspend':
>> drivers/mmc/host/sdhci-st.c:460:15: error: implicit declaration of function 'sdhci_suspend_host'; did you mean 'sdhci_add_host'? [-Wimplicit-function-declaration]
460 | ret = sdhci_suspend_host(host);
| ^~~~~~~~~~~~~~~~~~
| sdhci_add_host
drivers/mmc/host/sdhci-st.c: In function 'sdhci_st_resume':
>> drivers/mmc/host/sdhci-st.c:494:16: error: implicit declaration of function 'sdhci_resume_host'; did you mean 'sdhci_remove_host'? [-Wimplicit-function-declaration]
494 | return sdhci_resume_host(host);
| ^~~~~~~~~~~~~~~~~
| sdhci_remove_host
vim +460 drivers/mmc/host/sdhci-st.c
f52d9c4f459bda Peter Griffin 2014-07-09 449
f52d9c4f459bda Peter Griffin 2014-07-09 450 static int sdhci_st_suspend(struct device *dev)
f52d9c4f459bda Peter Griffin 2014-07-09 451 {
f52d9c4f459bda Peter Griffin 2014-07-09 452 struct sdhci_host *host = dev_get_drvdata(dev);
f52d9c4f459bda Peter Griffin 2014-07-09 453 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
1531675269c833 Jisheng Zhang 2016-02-16 454 struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host);
d38dcad4e7b48f Adrian Hunter 2017-03-20 455 int ret;
d38dcad4e7b48f Adrian Hunter 2017-03-20 456
d38dcad4e7b48f Adrian Hunter 2017-03-20 457 if (host->tuning_mode != SDHCI_TUNING_MODE_3)
d38dcad4e7b48f Adrian Hunter 2017-03-20 458 mmc_retune_needed(host->mmc);
f52d9c4f459bda Peter Griffin 2014-07-09 459
d38dcad4e7b48f Adrian Hunter 2017-03-20 @460 ret = sdhci_suspend_host(host);
f52d9c4f459bda Peter Griffin 2014-07-09 461 if (ret)
f52d9c4f459bda Peter Griffin 2014-07-09 462 goto out;
f52d9c4f459bda Peter Griffin 2014-07-09 463
406c24310a7bd7 Peter Griffin 2015-04-10 464 reset_control_assert(pdata->rstc);
406c24310a7bd7 Peter Griffin 2015-04-10 465
3ae50f4512ce83 Lee Jones 2016-09-08 466 clk_disable_unprepare(pdata->icnclk);
f52d9c4f459bda Peter Griffin 2014-07-09 467 clk_disable_unprepare(pltfm_host->clk);
f52d9c4f459bda Peter Griffin 2014-07-09 468 out:
f52d9c4f459bda Peter Griffin 2014-07-09 469 return ret;
f52d9c4f459bda Peter Griffin 2014-07-09 470 }
f52d9c4f459bda Peter Griffin 2014-07-09 471
f52d9c4f459bda Peter Griffin 2014-07-09 472 static int sdhci_st_resume(struct device *dev)
f52d9c4f459bda Peter Griffin 2014-07-09 473 {
f52d9c4f459bda Peter Griffin 2014-07-09 474 struct sdhci_host *host = dev_get_drvdata(dev);
f52d9c4f459bda Peter Griffin 2014-07-09 475 struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
1531675269c833 Jisheng Zhang 2016-02-16 476 struct st_mmc_platform_data *pdata = sdhci_pltfm_priv(pltfm_host);
2053812f6e1af0 Peter Griffin 2015-04-10 477 struct device_node *np = dev->of_node;
7f55eb101d4a75 Arvind Yadav 2017-06-20 478 int ret;
f52d9c4f459bda Peter Griffin 2014-07-09 479
7f55eb101d4a75 Arvind Yadav 2017-06-20 480 ret = clk_prepare_enable(pltfm_host->clk);
7f55eb101d4a75 Arvind Yadav 2017-06-20 481 if (ret)
7f55eb101d4a75 Arvind Yadav 2017-06-20 482 return ret;
7f55eb101d4a75 Arvind Yadav 2017-06-20 483
7f55eb101d4a75 Arvind Yadav 2017-06-20 484 ret = clk_prepare_enable(pdata->icnclk);
7f55eb101d4a75 Arvind Yadav 2017-06-20 485 if (ret) {
7f55eb101d4a75 Arvind Yadav 2017-06-20 486 clk_disable_unprepare(pltfm_host->clk);
7f55eb101d4a75 Arvind Yadav 2017-06-20 487 return ret;
7f55eb101d4a75 Arvind Yadav 2017-06-20 488 }
f52d9c4f459bda Peter Griffin 2014-07-09 489
406c24310a7bd7 Peter Griffin 2015-04-10 490 reset_control_deassert(pdata->rstc);
406c24310a7bd7 Peter Griffin 2015-04-10 491
2053812f6e1af0 Peter Griffin 2015-04-10 492 st_mmcss_cconfig(np, host);
2053812f6e1af0 Peter Griffin 2015-04-10 493
f52d9c4f459bda Peter Griffin 2014-07-09 @494 return sdhci_resume_host(host);
f52d9c4f459bda Peter Griffin 2014-07-09 495 }
f52d9c4f459bda Peter Griffin 2014-07-09 496
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/6] mtd: st_spi_fsm: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-12-28 23:32 [PATCH 0/6] Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
2024-12-28 23:32 ` [PATCH 1/6] usb: dwc3: st: " Raphael Gallais-Pou
2024-12-28 23:32 ` [PATCH 2/6] mmc: sdhci-st: " Raphael Gallais-Pou
@ 2024-12-28 23:32 ` Raphael Gallais-Pou
2024-12-30 8:46 ` Miquel Raynal
2024-12-28 23:32 ` [PATCH 4/6] ahci: st: " Raphael Gallais-Pou
` (3 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: Raphael Gallais-Pou @ 2024-12-28 23:32 UTC (permalink / raw)
To: Patrice Chotard, Thinh Nguyen, Greg Kroah-Hartman, Adrian Hunter,
Ulf Hansson, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Damien Le Moal, Niklas Cassel,
Alexandre Torgue, Jose Abreu, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin,
Mark Brown
Cc: linux-arm-kernel, linux-usb, linux-kernel, linux-mmc, linux-mtd,
linux-ide, netdev, linux-stm32, linux-spi
Letting the compiler remove these functions when the kernel is built
without CONFIG_PM_SLEEP support is simpler and less error prone than the
use of #ifdef based kernel configuration guards.
Link: https://lore.kernel.org/all/20240716180010.126987-1-rgallaispou@gmail.com
Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
---
drivers/mtd/devices/st_spi_fsm.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c
index dba584fa2a530b8d32eccc4ebc4d04ce01582ca8..f2266145b82167a4f7a063bcc7815115815483a1 100644
--- a/drivers/mtd/devices/st_spi_fsm.c
+++ b/drivers/mtd/devices/st_spi_fsm.c
@@ -2104,7 +2104,6 @@ static void stfsm_remove(struct platform_device *pdev)
WARN_ON(mtd_device_unregister(&fsm->mtd));
}
-#ifdef CONFIG_PM_SLEEP
static int stfsmfsm_suspend(struct device *dev)
{
struct stfsm *fsm = dev_get_drvdata(dev);
@@ -2120,9 +2119,8 @@ static int stfsmfsm_resume(struct device *dev)
return clk_prepare_enable(fsm->clk);
}
-#endif
-static SIMPLE_DEV_PM_OPS(stfsm_pm_ops, stfsmfsm_suspend, stfsmfsm_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(stfsm_pm_ops, stfsmfsm_suspend, stfsmfsm_resume);
static const struct of_device_id stfsm_match[] = {
{ .compatible = "st,spi-fsm", },
@@ -2136,7 +2134,7 @@ static struct platform_driver stfsm_driver = {
.driver = {
.name = "st-spi-fsm",
.of_match_table = stfsm_match,
- .pm = &stfsm_pm_ops,
+ .pm = pm_sleep_ptr(&stfsm_pm_ops),
},
};
module_platform_driver(stfsm_driver);
--
2.47.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 3/6] mtd: st_spi_fsm: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-12-28 23:32 ` [PATCH 3/6] mtd: st_spi_fsm: " Raphael Gallais-Pou
@ 2024-12-30 8:46 ` Miquel Raynal
0 siblings, 0 replies; 13+ messages in thread
From: Miquel Raynal @ 2024-12-30 8:46 UTC (permalink / raw)
To: Raphael Gallais-Pou
Cc: Patrice Chotard, Thinh Nguyen, Greg Kroah-Hartman, Adrian Hunter,
Ulf Hansson, Richard Weinberger, Vignesh Raghavendra,
Damien Le Moal, Niklas Cassel, Alexandre Torgue, Jose Abreu,
Andrew Lunn, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Maxime Coquelin, Mark Brown, linux-arm-kernel,
linux-usb, linux-kernel, linux-mmc, linux-mtd, linux-ide, netdev,
linux-stm32, linux-spi
Hello Raphael,
On 29/12/2024 at 00:32:42 +01, Raphael Gallais-Pou <rgallaispou@gmail.com> wrote:
> Letting the compiler remove these functions when the kernel is built
> without CONFIG_PM_SLEEP support is simpler and less error prone than the
> use of #ifdef based kernel configuration guards.
If that does not lead to any warning, I'm fine. However this kind of
change is better received subsystem-wide than platform-wide, if you ever
wish to go this route.
> Link: https://lore.kernel.org/all/20240716180010.126987-1-rgallaispou@gmail.com
This link however seems irrelevant.
> Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
Thanks,
Miquèl
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/6] ahci: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-12-28 23:32 [PATCH 0/6] Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
` (2 preceding siblings ...)
2024-12-28 23:32 ` [PATCH 3/6] mtd: st_spi_fsm: " Raphael Gallais-Pou
@ 2024-12-28 23:32 ` Raphael Gallais-Pou
2024-12-28 23:32 ` [PATCH 5/6] net: stmmac: sti: " Raphael Gallais-Pou
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Raphael Gallais-Pou @ 2024-12-28 23:32 UTC (permalink / raw)
To: Patrice Chotard, Thinh Nguyen, Greg Kroah-Hartman, Adrian Hunter,
Ulf Hansson, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Damien Le Moal, Niklas Cassel,
Alexandre Torgue, Jose Abreu, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin,
Mark Brown
Cc: linux-arm-kernel, linux-usb, linux-kernel, linux-mmc, linux-mtd,
linux-ide, netdev, linux-stm32, linux-spi
Letting the compiler remove these functions when the kernel is built
without CONFIG_PM_SLEEP support is simpler and less error prone than the
use of #ifdef based kernel configuration guards.
Link: https://lore.kernel.org/all/20240716180010.126987-1-rgallaispou@gmail.com
Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
---
drivers/ata/ahci_st.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c
index 6b9b4a1dfa15bb6f395cc742f25251376b869a21..4336c8a6e20871fe25b61d6e2043fa15902b3559 100644
--- a/drivers/ata/ahci_st.c
+++ b/drivers/ata/ahci_st.c
@@ -176,7 +176,6 @@ static int st_ahci_probe(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM_SLEEP
static int st_ahci_suspend(struct device *dev)
{
struct ata_host *host = dev_get_drvdata(dev);
@@ -221,9 +220,8 @@ static int st_ahci_resume(struct device *dev)
return ahci_platform_resume_host(dev);
}
-#endif
-static SIMPLE_DEV_PM_OPS(st_ahci_pm_ops, st_ahci_suspend, st_ahci_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(st_ahci_pm_ops, st_ahci_suspend, st_ahci_resume);
static const struct of_device_id st_ahci_match[] = {
{ .compatible = "st,ahci", },
@@ -234,7 +232,7 @@ MODULE_DEVICE_TABLE(of, st_ahci_match);
static struct platform_driver st_ahci_driver = {
.driver = {
.name = DRV_NAME,
- .pm = &st_ahci_pm_ops,
+ .pm = pm_sleep_ptr(&st_ahci_pm_ops),
.of_match_table = st_ahci_match,
},
.probe = st_ahci_probe,
--
2.47.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/6] net: stmmac: sti: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-12-28 23:32 [PATCH 0/6] Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
` (3 preceding siblings ...)
2024-12-28 23:32 ` [PATCH 4/6] ahci: st: " Raphael Gallais-Pou
@ 2024-12-28 23:32 ` Raphael Gallais-Pou
2024-12-28 23:32 ` [PATCH 6/6] spi: st: " Raphael Gallais-Pou
2025-01-06 13:08 ` [PATCH 0/6] " Mark Brown
6 siblings, 0 replies; 13+ messages in thread
From: Raphael Gallais-Pou @ 2024-12-28 23:32 UTC (permalink / raw)
To: Patrice Chotard, Thinh Nguyen, Greg Kroah-Hartman, Adrian Hunter,
Ulf Hansson, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Damien Le Moal, Niklas Cassel,
Alexandre Torgue, Jose Abreu, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin,
Mark Brown
Cc: linux-arm-kernel, linux-usb, linux-kernel, linux-mmc, linux-mtd,
linux-ide, netdev, linux-stm32, linux-spi
Letting the compiler remove these functions when the kernel is built
without CONFIG_PM_SLEEP support is simpler and less error prone than the
use of #ifdef based kernel configuration guards.
Link: https://lore.kernel.org/all/20240716180010.126987-1-rgallaispou@gmail.com
Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
---
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
index eabc4da9e1a985101643908d2efdb0b4acaa9d60..de9b6dfef15b3d0a503a3b55b3e9a42ee68c6141 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c
@@ -313,7 +313,6 @@ static void sti_dwmac_remove(struct platform_device *pdev)
clk_disable_unprepare(dwmac->clk);
}
-#ifdef CONFIG_PM_SLEEP
static int sti_dwmac_suspend(struct device *dev)
{
struct sti_dwmac *dwmac = get_stmmac_bsp_priv(dev);
@@ -333,10 +332,9 @@ static int sti_dwmac_resume(struct device *dev)
return stmmac_resume(dev);
}
-#endif /* CONFIG_PM_SLEEP */
-static SIMPLE_DEV_PM_OPS(sti_dwmac_pm_ops, sti_dwmac_suspend,
- sti_dwmac_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(sti_dwmac_pm_ops, sti_dwmac_suspend,
+ sti_dwmac_resume);
static const struct sti_dwmac_of_data stih4xx_dwmac_data = {
.fix_retime_src = stih4xx_fix_retime_src,
@@ -353,7 +351,7 @@ static struct platform_driver sti_dwmac_driver = {
.remove = sti_dwmac_remove,
.driver = {
.name = "sti-dwmac",
- .pm = &sti_dwmac_pm_ops,
+ .pm = pm_sleep_ptr(&sti_dwmac_pm_ops),
.of_match_table = sti_dwmac_match,
},
};
--
2.47.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 6/6] spi: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-12-28 23:32 [PATCH 0/6] Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
` (4 preceding siblings ...)
2024-12-28 23:32 ` [PATCH 5/6] net: stmmac: sti: " Raphael Gallais-Pou
@ 2024-12-28 23:32 ` Raphael Gallais-Pou
2024-12-29 1:28 ` kernel test robot
2025-01-06 13:08 ` [PATCH 0/6] " Mark Brown
6 siblings, 1 reply; 13+ messages in thread
From: Raphael Gallais-Pou @ 2024-12-28 23:32 UTC (permalink / raw)
To: Patrice Chotard, Thinh Nguyen, Greg Kroah-Hartman, Adrian Hunter,
Ulf Hansson, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Damien Le Moal, Niklas Cassel,
Alexandre Torgue, Jose Abreu, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin,
Mark Brown
Cc: linux-arm-kernel, linux-usb, linux-kernel, linux-mmc, linux-mtd,
linux-ide, netdev, linux-stm32, linux-spi
Letting the compiler remove these functions when the kernel is built
without CONFIG_PM_SLEEP support is simpler and less error prone than the
use of #ifdef based kernel configuration guards.
Link: https://lore.kernel.org/all/20240716180010.126987-1-rgallaispou@gmail.com
Signed-off-by: Raphael Gallais-Pou <rgallaispou@gmail.com>
---
drivers/spi/spi-st-ssc4.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/spi/spi-st-ssc4.c b/drivers/spi/spi-st-ssc4.c
index 4cff976ab16fbdf3708ab870176a04f2628b501b..5cc452447410bedf3c12893d94bc959892ac827d 100644
--- a/drivers/spi/spi-st-ssc4.c
+++ b/drivers/spi/spi-st-ssc4.c
@@ -378,7 +378,6 @@ static void spi_st_remove(struct platform_device *pdev)
pinctrl_pm_select_sleep_state(&pdev->dev);
}
-#ifdef CONFIG_PM
static int spi_st_runtime_suspend(struct device *dev)
{
struct spi_controller *host = dev_get_drvdata(dev);
@@ -403,9 +402,7 @@ static int spi_st_runtime_resume(struct device *dev)
return ret;
}
-#endif
-#ifdef CONFIG_PM_SLEEP
static int spi_st_suspend(struct device *dev)
{
struct spi_controller *host = dev_get_drvdata(dev);
@@ -429,7 +426,6 @@ static int spi_st_resume(struct device *dev)
return pm_runtime_force_resume(dev);
}
-#endif
static const struct dev_pm_ops spi_st_pm = {
SET_SYSTEM_SLEEP_PM_OPS(spi_st_suspend, spi_st_resume)
@@ -445,7 +441,7 @@ MODULE_DEVICE_TABLE(of, stm_spi_match);
static struct platform_driver spi_st_driver = {
.driver = {
.name = "spi-st",
- .pm = &spi_st_pm,
+ .pm = pm_sleep_ptr(&spi_st_pm),
.of_match_table = of_match_ptr(stm_spi_match),
},
.probe = spi_st_probe,
--
2.47.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 6/6] spi: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-12-28 23:32 ` [PATCH 6/6] spi: st: " Raphael Gallais-Pou
@ 2024-12-29 1:28 ` kernel test robot
0 siblings, 0 replies; 13+ messages in thread
From: kernel test robot @ 2024-12-29 1:28 UTC (permalink / raw)
To: Raphael Gallais-Pou, Patrice Chotard, Thinh Nguyen,
Greg Kroah-Hartman, Adrian Hunter, Ulf Hansson, Miquel Raynal,
Richard Weinberger, Vignesh Raghavendra, Damien Le Moal,
Niklas Cassel, Alexandre Torgue, Jose Abreu, Andrew Lunn,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Maxime Coquelin, Mark Brown
Cc: oe-kbuild-all, netdev, linux-arm-kernel, linux-usb, linux-kernel,
linux-mmc, linux-mtd, linux-ide, linux-stm32, linux-spi
Hi Raphael,
kernel test robot noticed the following build warnings:
[auto build test WARNING on 8155b4ef3466f0e289e8fcc9e6e62f3f4dceeac2]
url: https://github.com/intel-lab-lkp/linux/commits/Raphael-Gallais-Pou/usb-dwc3-st-Switch-from-CONFIG_PM_SLEEP-guards-to-pm_sleep_ptr/20241229-073700
base: 8155b4ef3466f0e289e8fcc9e6e62f3f4dceeac2
patch link: https://lore.kernel.org/r/20241229-update_pm_macro-v1-6-c7d4c4856336%40gmail.com
patch subject: [PATCH 6/6] spi: st: Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
config: arm-randconfig-002-20241229 (https://download.01.org/0day-ci/archive/20241229/202412290921.tY3nJMjm-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241229/202412290921.tY3nJMjm-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202412290921.tY3nJMjm-lkp@intel.com/
All warnings (new ones prefixed by >>):
>> drivers/spi/spi-st-ssc4.c:418:12: warning: 'spi_st_resume' defined but not used [-Wunused-function]
418 | static int spi_st_resume(struct device *dev)
| ^~~~~~~~~~~~~
>> drivers/spi/spi-st-ssc4.c:406:12: warning: 'spi_st_suspend' defined but not used [-Wunused-function]
406 | static int spi_st_suspend(struct device *dev)
| ^~~~~~~~~~~~~~
vim +/spi_st_resume +418 drivers/spi/spi-st-ssc4.c
9e862375c5420a Lee Jones 2014-12-09 405
9e862375c5420a Lee Jones 2014-12-09 @406 static int spi_st_suspend(struct device *dev)
9e862375c5420a Lee Jones 2014-12-09 407 {
e6b7e64cb11966 Yang Yingliang 2023-11-28 408 struct spi_controller *host = dev_get_drvdata(dev);
9e862375c5420a Lee Jones 2014-12-09 409 int ret;
9e862375c5420a Lee Jones 2014-12-09 410
e6b7e64cb11966 Yang Yingliang 2023-11-28 411 ret = spi_controller_suspend(host);
9e862375c5420a Lee Jones 2014-12-09 412 if (ret)
9e862375c5420a Lee Jones 2014-12-09 413 return ret;
9e862375c5420a Lee Jones 2014-12-09 414
9e862375c5420a Lee Jones 2014-12-09 415 return pm_runtime_force_suspend(dev);
9e862375c5420a Lee Jones 2014-12-09 416 }
9e862375c5420a Lee Jones 2014-12-09 417
9e862375c5420a Lee Jones 2014-12-09 @418 static int spi_st_resume(struct device *dev)
9e862375c5420a Lee Jones 2014-12-09 419 {
e6b7e64cb11966 Yang Yingliang 2023-11-28 420 struct spi_controller *host = dev_get_drvdata(dev);
9e862375c5420a Lee Jones 2014-12-09 421 int ret;
9e862375c5420a Lee Jones 2014-12-09 422
e6b7e64cb11966 Yang Yingliang 2023-11-28 423 ret = spi_controller_resume(host);
9e862375c5420a Lee Jones 2014-12-09 424 if (ret)
9e862375c5420a Lee Jones 2014-12-09 425 return ret;
9e862375c5420a Lee Jones 2014-12-09 426
9e862375c5420a Lee Jones 2014-12-09 427 return pm_runtime_force_resume(dev);
9e862375c5420a Lee Jones 2014-12-09 428 }
9e862375c5420a Lee Jones 2014-12-09 429
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/6] Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2024-12-28 23:32 [PATCH 0/6] Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr() Raphael Gallais-Pou
` (5 preceding siblings ...)
2024-12-28 23:32 ` [PATCH 6/6] spi: st: " Raphael Gallais-Pou
@ 2025-01-06 13:08 ` Mark Brown
2025-01-07 0:31 ` Raphaël Gallais-Pou
6 siblings, 1 reply; 13+ messages in thread
From: Mark Brown @ 2025-01-06 13:08 UTC (permalink / raw)
To: Raphael Gallais-Pou
Cc: Patrice Chotard, Thinh Nguyen, Greg Kroah-Hartman, Adrian Hunter,
Ulf Hansson, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Damien Le Moal, Niklas Cassel,
Alexandre Torgue, Jose Abreu, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin,
linux-arm-kernel, linux-usb, linux-kernel, linux-mmc, linux-mtd,
linux-ide, netdev, linux-stm32, linux-spi
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
On Sun, Dec 29, 2024 at 12:32:39AM +0100, Raphael Gallais-Pou wrote:
> Prevent the use of macros, and rely instead on kernel configuration for
> power management.
>
> This series makes the same change over six different drivers:
> usb-st-dwc3, sdhci-st, st-spi-fsm, ahci_st, sti-dwmac, spi-st.
Is there any actual interaction between these changes? In general you
shouldn't combine patches for multiple subsystems into a single series
unless there's some dependency or other interaction since it just
complicates management of the patches.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 0/6] Switch from CONFIG_PM_SLEEP guards to pm_sleep_ptr()
2025-01-06 13:08 ` [PATCH 0/6] " Mark Brown
@ 2025-01-07 0:31 ` Raphaël Gallais-Pou
0 siblings, 0 replies; 13+ messages in thread
From: Raphaël Gallais-Pou @ 2025-01-07 0:31 UTC (permalink / raw)
To: Mark Brown
Cc: Patrice Chotard, Thinh Nguyen, Greg Kroah-Hartman, Adrian Hunter,
Ulf Hansson, Miquel Raynal, Richard Weinberger,
Vignesh Raghavendra, Damien Le Moal, Niklas Cassel,
Alexandre Torgue, Jose Abreu, Andrew Lunn, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Maxime Coquelin,
linux-arm-kernel, linux-usb, linux-kernel, linux-mmc, linux-mtd,
linux-ide, netdev, linux-stm32, linux-spi
Le 06/01/2025 à 14:08, Mark Brown a écrit :
> On Sun, Dec 29, 2024 at 12:32:39AM +0100, Raphael Gallais-Pou wrote:
>> Prevent the use of macros, and rely instead on kernel configuration for
>> power management.
>>
>> This series makes the same change over six different drivers:
>> usb-st-dwc3, sdhci-st, st-spi-fsm, ahci_st, sti-dwmac, spi-st.
>
> Is there any actual interaction between these changes? In general you
> shouldn't combine patches for multiple subsystems into a single series
> unless there's some dependency or other interaction since it just
> complicates management of the patches.
Hi,
No, there isn't apart from the fact that those are stm32 drivers. As
Miquel also stated a few days ago, is was wrong for me to sent all of
this in a whole serie. I will just resend them separately as a v2,
taking into account Miquel's review[1] and the kernel robot.
Regards,
Raphaël
[1] https://lore.kernel.org/lkml/877c7ha77n.fsf@bootlin.com/
^ permalink raw reply [flat|nested] 13+ messages in thread