[PATCH 1/5 next] net: vertexcom: mse102x: Use DEFINE_SIMPLE_DEV_PM_OPS

Stefan Wahren posted 5 patches 1 year, 3 months ago
[PATCH 1/5 next] net: vertexcom: mse102x: Use DEFINE_SIMPLE_DEV_PM_OPS
Posted by Stefan Wahren 1 year, 3 months ago
This macro has the advantage over SET_SYSTEM_SLEEP_PM_OPS that we don't
have to care about when the functions are actually used.

Also make use of pm_sleep_ptr() to discard all PM_SLEEP related
stuff if CONFIG_PM_SLEEP isn't enabled.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
 drivers/net/ethernet/vertexcom/mse102x.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/vertexcom/mse102x.c b/drivers/net/ethernet/vertexcom/mse102x.c
index edd8b59680e5..0711641fc3c9 100644
--- a/drivers/net/ethernet/vertexcom/mse102x.c
+++ b/drivers/net/ethernet/vertexcom/mse102x.c
@@ -622,8 +622,6 @@ static const struct ethtool_ops mse102x_ethtool_ops = {

 /* driver bus management functions */

-#ifdef CONFIG_PM_SLEEP
-
 static int mse102x_suspend(struct device *dev)
 {
 	struct mse102x_net *mse = dev_get_drvdata(dev);
@@ -649,9 +647,8 @@ static int mse102x_resume(struct device *dev)

 	return 0;
 }
-#endif

-static SIMPLE_DEV_PM_OPS(mse102x_pm_ops, mse102x_suspend, mse102x_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(mse102x_pm_ops, mse102x_suspend, mse102x_resume);

 static int mse102x_probe_spi(struct spi_device *spi)
 {
@@ -761,7 +758,7 @@ static struct spi_driver mse102x_driver = {
 	.driver = {
 		.name = DRV_NAME,
 		.of_match_table = mse102x_match_table,
-		.pm = &mse102x_pm_ops,
+		.pm = pm_sleep_ptr(&mse102x_pm_ops),
 	},
 	.probe = mse102x_probe_spi,
 	.remove = mse102x_remove_spi,
--
2.34.1
Re: [PATCH 1/5 next] net: vertexcom: mse102x: Use DEFINE_SIMPLE_DEV_PM_OPS
Posted by Simon Horman 1 year, 3 months ago
On Tue, Aug 27, 2024 at 09:09:56PM +0200, Stefan Wahren wrote:
> This macro has the advantage over SET_SYSTEM_SLEEP_PM_OPS that we don't
> have to care about when the functions are actually used.
> 
> Also make use of pm_sleep_ptr() to discard all PM_SLEEP related
> stuff if CONFIG_PM_SLEEP isn't enabled.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>

Reviewed-by: Simon Horman <horms@kernel.org>

One note, no need to respin because of this.
This series should be targeted at net-next.

	Subject: [PATCH m/n net-next] ...