[PATCH 0/3] platform/chrome: Use new PM_OPS macros

[PATCH 0/3] platform/chrome: Use new PM_OPS macros

[Gwendal Grignou]

commit 296282fca791 ("PM: core: Add new *_PM_OPS macros, deprecate old ones")
Add new macros to remove __maybe_unused and/or #ifdef CONFIG_PM_SLEEP.

Apply them to plaform/chrome, using .cocci script to ease the
refactoring.
Only one #ifdef remains, in cros_ec.c to expose core suspend/resume
routine.

Gwendal Grignou (3):
  plaform/chrome: remove SET_SYSTEM_SLEEP_PM_OPS
  plaform/chrome: Remove SIMPLE_DEV_PM_OPS
  plaform/chrome: Remove SET_LATE_SYSTEM_SLEEP_PM_OPS

 drivers/platform/chrome/chromeos_tbmc.c     |  6 +++---
 drivers/platform/chrome/cros_ec_debugfs.c   |  8 ++++----
 drivers/platform/chrome/cros_ec_i2c.c       |  6 ++----
 drivers/platform/chrome/cros_ec_ishtp.c     |  8 ++++----
 drivers/platform/chrome/cros_ec_lightbar.c  |  8 ++++----
 drivers/platform/chrome/cros_ec_lpc.c       |  6 ++----
 drivers/platform/chrome/cros_ec_rpmsg.c     |  6 ++----
 drivers/platform/chrome/cros_ec_sensorhub.c |  6 ++----
 drivers/platform/chrome/cros_ec_spi.c       |  6 ++----
 drivers/platform/chrome/cros_ec_typec.c     | 10 ++++------
 drivers/platform/chrome/cros_usbpd_logger.c |  8 ++++----
 11 files changed, 33 insertions(+), 45 deletions(-)

-- 
2.34.1.448.ga2b2bfdf31-goog

[PATCH 1/3] plaform/chrome: remove SET_SYSTEM_SLEEP_PM_OPS

[Gwendal Grignou]

commit 296282fca791 ("PM: core: Add new *_PM_OPS macros, deprecate old ones")
replaces SET_SIMPLE_DEV_PM_OPS with DEFINE_SIMPLE_DEV_PM_OPS.

Use sed and a cocci script to replace the macro and remove
__maybe_unused:
@Replacement@
identifier operation;
identifier suspend, resume;
@@
- static const struct dev_pm_ops operation = { SET_SYSTEM_SLEEP_PM_OPS(suspend, resume) };
+ gg_fc operation = gg_arg(suspend, resume);

@@
identifier Replacement.suspend;
identifier dev;
@@

- __maybe_unused
suspend(struct device* dev ) { ... }
@@
identifier Replacement.resume;
identifier dev;
@@

- __maybe_unused
resume(struct device* dev ) { ... }

@@
identifier Replacement.operation;
@@

- &operation
+ pm_sleep_ptr(&operation)

spatch -sp_file no_SET_SYSTEM_SLEEP_PM_OPS.cocci -dir drivers/platform/chrome |
patch -p 1 -d drivers/platform/chrome
sed -i 's/gg_fc \(.*\) = gg_arg(/DEFINE_SIMPLE_DEV_PM_OPS(\1, /' $(git
diff --name-only)

Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
---
 drivers/platform/chrome/cros_ec_typec.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index 5de0bfb0bc4d99..c3d449f9e38bc6 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -1129,7 +1129,7 @@ static int cros_typec_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int __maybe_unused cros_typec_suspend(struct device *dev)
+static int cros_typec_suspend(struct device *dev)
 {
 	struct cros_typec_data *typec = dev_get_drvdata(dev);
 
@@ -1138,7 +1138,7 @@ static int __maybe_unused cros_typec_suspend(struct device *dev)
 	return 0;
 }
 
-static int __maybe_unused cros_typec_resume(struct device *dev)
+static int cros_typec_resume(struct device *dev)
 {
 	struct cros_typec_data *typec = dev_get_drvdata(dev);
 
@@ -1148,16 +1148,14 @@ static int __maybe_unused cros_typec_resume(struct device *dev)
 	return 0;
 }
 
-static const struct dev_pm_ops cros_typec_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(cros_typec_suspend, cros_typec_resume)
-};
+DEFINE_SIMPLE_DEV_PM_OPS(cros_typec_pm_ops, cros_typec_suspend, cros_typec_resume);
 
 static struct platform_driver cros_typec_driver = {
 	.driver	= {
 		.name = DRV_NAME,
 		.acpi_match_table = ACPI_PTR(cros_typec_acpi_id),
 		.of_match_table = of_match_ptr(cros_typec_of_match),
-		.pm = &cros_typec_pm_ops,
+		.pm = pm_sleep_ptr(&cros_typec_pm_ops),
 	},
 	.probe = cros_typec_probe,
 };
-- 
2.34.1.448.ga2b2bfdf31-goog

[PATCH 2/3] plaform/chrome: Remove SIMPLE_DEV_PM_OPS

[Gwendal Grignou]

commit 296282fca791 ("PM: core: Add new *_PM_OPS macros, deprecate old ones")
replaces SIMPLE_DEV_PM_OPS with DEFINE_SIMPLE_DEV_PM_OPS.

Use sed and a cocci script to replace the macro and remove
__maybe_unused:
@ Replacement @
identifier operation;
identifier suspend, resume;
@@

gg_type operation = gg_arg(suspend, resume);

@@
identifier Replacement.suspend;
identifier dev;
@@

- __maybe_unused
suspend(struct device* dev ) { ... }

@@
identifier Replacement.resume;
identifier dev;
@@

- __maybe_unused
resume(struct device* dev ) { ... }

@@
identifier Replacement.operation;
@@

- &operation
+ pm_sleep_ptr(&operation)

find drivers/platform/chrome -type f -name \*.c \
-exec sed -i 's/static SIMPLE_DEV_PM_OPS(\(.*\), */gg_type \1 = gg_arg(/' {} \+
spatch -sp_file no_SIMPLE_DEV_PM_OPS.cocci -dir drivers/platform/chrome | \
patch -p 1 -d drivers/platform/chrome/
sed -i 's/gg_type \(.*\) = gg_arg(/DEFINE_SIMPLE_DEV_PM_OPS(\1, /' $(git diff --name-only)

Remove #ifdef CONFIG_PM_SLEEP when not needed anymore.
Test with make allmodconfig, with CONFIG_PM_SLEEP set to 'y' and 'n'.

Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
---
 drivers/platform/chrome/chromeos_tbmc.c     | 6 +++---
 drivers/platform/chrome/cros_ec_debugfs.c   | 8 ++++----
 drivers/platform/chrome/cros_ec_ishtp.c     | 8 ++++----
 drivers/platform/chrome/cros_ec_lightbar.c  | 8 ++++----
 drivers/platform/chrome/cros_ec_rpmsg.c     | 6 ++----
 drivers/platform/chrome/cros_ec_sensorhub.c | 6 ++----
 drivers/platform/chrome/cros_ec_spi.c       | 6 ++----
 drivers/platform/chrome/cros_usbpd_logger.c | 8 ++++----
 8 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/drivers/platform/chrome/chromeos_tbmc.c b/drivers/platform/chrome/chromeos_tbmc.c
index d1cf8f3463ce3b..c10f39b3eb53be 100644
--- a/drivers/platform/chrome/chromeos_tbmc.c
+++ b/drivers/platform/chrome/chromeos_tbmc.c
@@ -38,7 +38,7 @@ static int chromeos_tbmc_query_switch(struct acpi_device *adev,
 	return 0;
 }
 
-static __maybe_unused int chromeos_tbmc_resume(struct device *dev)
+static int chromeos_tbmc_resume(struct device *dev)
 {
 	struct acpi_device *adev = to_acpi_device(dev);
 
@@ -101,7 +101,7 @@ static const struct acpi_device_id chromeos_tbmc_acpi_device_ids[] = {
 };
 MODULE_DEVICE_TABLE(acpi, chromeos_tbmc_acpi_device_ids);
 
-static SIMPLE_DEV_PM_OPS(chromeos_tbmc_pm_ops, NULL,
+DEFINE_SIMPLE_DEV_PM_OPS(chromeos_tbmc_pm_ops, NULL,
 		chromeos_tbmc_resume);
 
 static struct acpi_driver chromeos_tbmc_driver = {
@@ -112,7 +112,7 @@ static struct acpi_driver chromeos_tbmc_driver = {
 		.add = chromeos_tbmc_add,
 		.notify = chromeos_tbmc_notify,
 	},
-	.drv.pm = &chromeos_tbmc_pm_ops,
+	.drv.pm = pm_sleep_ptr(&chromeos_tbmc_pm_ops),
 };
 
 module_acpi_driver(chromeos_tbmc_driver);
diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c
index 272c89837d745a..c72c13ad7943fc 100644
--- a/drivers/platform/chrome/cros_ec_debugfs.c
+++ b/drivers/platform/chrome/cros_ec_debugfs.c
@@ -491,7 +491,7 @@ static int cros_ec_debugfs_remove(struct platform_device *pd)
 	return 0;
 }
 
-static int __maybe_unused cros_ec_debugfs_suspend(struct device *dev)
+static int cros_ec_debugfs_suspend(struct device *dev)
 {
 	struct cros_ec_dev *ec = dev_get_drvdata(dev);
 
@@ -501,7 +501,7 @@ static int __maybe_unused cros_ec_debugfs_suspend(struct device *dev)
 	return 0;
 }
 
-static int __maybe_unused cros_ec_debugfs_resume(struct device *dev)
+static int cros_ec_debugfs_resume(struct device *dev)
 {
 	struct cros_ec_dev *ec = dev_get_drvdata(dev);
 
@@ -511,13 +511,13 @@ static int __maybe_unused cros_ec_debugfs_resume(struct device *dev)
 	return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(cros_ec_debugfs_pm_ops,
+DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_debugfs_pm_ops,
 			 cros_ec_debugfs_suspend, cros_ec_debugfs_resume);
 
 static struct platform_driver cros_ec_debugfs_driver = {
 	.driver = {
 		.name = DRV_NAME,
-		.pm = &cros_ec_debugfs_pm_ops,
+		.pm = pm_sleep_ptr(&cros_ec_debugfs_pm_ops),
 	},
 	.probe = cros_ec_debugfs_probe,
 	.remove = cros_ec_debugfs_remove,
diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c
index 4020b8354bae90..0f14f5782bee25 100644
--- a/drivers/platform/chrome/cros_ec_ishtp.c
+++ b/drivers/platform/chrome/cros_ec_ishtp.c
@@ -739,7 +739,7 @@ static int cros_ec_ishtp_reset(struct ishtp_cl_device *cl_device)
  *
  * Return: 0 for success, negative error code for failure.
  */
-static int __maybe_unused cros_ec_ishtp_suspend(struct device *device)
+static int cros_ec_ishtp_suspend(struct device *device)
 {
 	struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device);
 	struct ishtp_cl	*cros_ish_cl = ishtp_get_drvdata(cl_device);
@@ -754,7 +754,7 @@ static int __maybe_unused cros_ec_ishtp_suspend(struct device *device)
  *
  * Return: 0 for success, negative error code for failure.
  */
-static int __maybe_unused cros_ec_ishtp_resume(struct device *device)
+static int cros_ec_ishtp_resume(struct device *device)
 {
 	struct ishtp_cl_device *cl_device = ishtp_dev_to_cl_device(device);
 	struct ishtp_cl	*cros_ish_cl = ishtp_get_drvdata(cl_device);
@@ -763,7 +763,7 @@ static int __maybe_unused cros_ec_ishtp_resume(struct device *device)
 	return cros_ec_resume(client_data->ec_dev);
 }
 
-static SIMPLE_DEV_PM_OPS(cros_ec_ishtp_pm_ops, cros_ec_ishtp_suspend,
+DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_ishtp_pm_ops, cros_ec_ishtp_suspend,
 			 cros_ec_ishtp_resume);
 
 static struct ishtp_cl_driver	cros_ec_ishtp_driver = {
@@ -773,7 +773,7 @@ static struct ishtp_cl_driver	cros_ec_ishtp_driver = {
 	.remove = cros_ec_ishtp_remove,
 	.reset = cros_ec_ishtp_reset,
 	.driver = {
-		.pm = &cros_ec_ishtp_pm_ops,
+		.pm = pm_sleep_ptr(&cros_ec_ishtp_pm_ops),
 	},
 };
 
diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c
index 469dfc7a4a0302..52647d6804fc30 100644
--- a/drivers/platform/chrome/cros_ec_lightbar.c
+++ b/drivers/platform/chrome/cros_ec_lightbar.c
@@ -574,7 +574,7 @@ static int cros_ec_lightbar_remove(struct platform_device *pd)
 	return 0;
 }
 
-static int __maybe_unused cros_ec_lightbar_resume(struct device *dev)
+static int cros_ec_lightbar_resume(struct device *dev)
 {
 	struct cros_ec_dev *ec_dev = dev_get_drvdata(dev->parent);
 
@@ -584,7 +584,7 @@ static int __maybe_unused cros_ec_lightbar_resume(struct device *dev)
 	return lb_send_empty_cmd(ec_dev, LIGHTBAR_CMD_RESUME);
 }
 
-static int __maybe_unused cros_ec_lightbar_suspend(struct device *dev)
+static int cros_ec_lightbar_suspend(struct device *dev)
 {
 	struct cros_ec_dev *ec_dev = dev_get_drvdata(dev->parent);
 
@@ -594,13 +594,13 @@ static int __maybe_unused cros_ec_lightbar_suspend(struct device *dev)
 	return lb_send_empty_cmd(ec_dev, LIGHTBAR_CMD_SUSPEND);
 }
 
-static SIMPLE_DEV_PM_OPS(cros_ec_lightbar_pm_ops,
+DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_lightbar_pm_ops,
 			 cros_ec_lightbar_suspend, cros_ec_lightbar_resume);
 
 static struct platform_driver cros_ec_lightbar_driver = {
 	.driver = {
 		.name = DRV_NAME,
-		.pm = &cros_ec_lightbar_pm_ops,
+		.pm = pm_sleep_ptr(&cros_ec_lightbar_pm_ops),
 	},
 	.probe = cros_ec_lightbar_probe,
 	.remove = cros_ec_lightbar_remove,
diff --git a/drivers/platform/chrome/cros_ec_rpmsg.c b/drivers/platform/chrome/cros_ec_rpmsg.c
index d96d15b8ca946d..c8afb152673070 100644
--- a/drivers/platform/chrome/cros_ec_rpmsg.c
+++ b/drivers/platform/chrome/cros_ec_rpmsg.c
@@ -266,7 +266,6 @@ static void cros_ec_rpmsg_remove(struct rpmsg_device *rpdev)
 	cancel_work_sync(&ec_rpmsg->host_event_work);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int cros_ec_rpmsg_suspend(struct device *dev)
 {
 	struct cros_ec_device *ec_dev = dev_get_drvdata(dev);
@@ -280,9 +279,8 @@ static int cros_ec_rpmsg_resume(struct device *dev)
 
 	return cros_ec_resume(ec_dev);
 }
-#endif
 
-static SIMPLE_DEV_PM_OPS(cros_ec_rpmsg_pm_ops, cros_ec_rpmsg_suspend,
+DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_rpmsg_pm_ops, cros_ec_rpmsg_suspend,
 			 cros_ec_rpmsg_resume);
 
 static const struct of_device_id cros_ec_rpmsg_of_match[] = {
@@ -295,7 +293,7 @@ static struct rpmsg_driver cros_ec_driver_rpmsg = {
 	.drv = {
 		.name   = "cros-ec-rpmsg",
 		.of_match_table = cros_ec_rpmsg_of_match,
-		.pm	= &cros_ec_rpmsg_pm_ops,
+		.pm	= pm_sleep_ptr(&cros_ec_rpmsg_pm_ops),
 	},
 	.probe		= cros_ec_rpmsg_probe,
 	.remove		= cros_ec_rpmsg_remove,
diff --git a/drivers/platform/chrome/cros_ec_sensorhub.c b/drivers/platform/chrome/cros_ec_sensorhub.c
index 31fb8bdaad5a35..5e05ca6cdc2841 100644
--- a/drivers/platform/chrome/cros_ec_sensorhub.c
+++ b/drivers/platform/chrome/cros_ec_sensorhub.c
@@ -216,7 +216,6 @@ static int cros_ec_sensorhub_probe(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
 /*
  * When the EC is suspending, we must stop sending interrupt,
  * we may use the same interrupt line for waking up the device.
@@ -241,16 +240,15 @@ static int cros_ec_sensorhub_resume(struct device *dev)
 		return cros_ec_sensorhub_ring_fifo_enable(sensorhub, true);
 	return 0;
 }
-#endif
 
-static SIMPLE_DEV_PM_OPS(cros_ec_sensorhub_pm_ops,
+DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_sensorhub_pm_ops,
 		cros_ec_sensorhub_suspend,
 		cros_ec_sensorhub_resume);
 
 static struct platform_driver cros_ec_sensorhub_driver = {
 	.driver = {
 		.name = DRV_NAME,
-		.pm = &cros_ec_sensorhub_pm_ops,
+		.pm = pm_sleep_ptr(&cros_ec_sensorhub_pm_ops),
 	},
 	.probe = cros_ec_sensorhub_probe,
 };
diff --git a/drivers/platform/chrome/cros_ec_spi.c b/drivers/platform/chrome/cros_ec_spi.c
index 14c4046fa04d52..51db572c8166af 100644
--- a/drivers/platform/chrome/cros_ec_spi.c
+++ b/drivers/platform/chrome/cros_ec_spi.c
@@ -793,7 +793,6 @@ static int cros_ec_spi_remove(struct spi_device *spi)
 	return cros_ec_unregister(ec_dev);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int cros_ec_spi_suspend(struct device *dev)
 {
 	struct cros_ec_device *ec_dev = dev_get_drvdata(dev);
@@ -807,9 +806,8 @@ static int cros_ec_spi_resume(struct device *dev)
 
 	return cros_ec_resume(ec_dev);
 }
-#endif
 
-static SIMPLE_DEV_PM_OPS(cros_ec_spi_pm_ops, cros_ec_spi_suspend,
+DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_spi_pm_ops, cros_ec_spi_suspend,
 			 cros_ec_spi_resume);
 
 static const struct of_device_id cros_ec_spi_of_match[] = {
@@ -828,7 +826,7 @@ static struct spi_driver cros_ec_driver_spi = {
 	.driver	= {
 		.name	= "cros-ec-spi",
 		.of_match_table = cros_ec_spi_of_match,
-		.pm	= &cros_ec_spi_pm_ops,
+		.pm	= pm_sleep_ptr(&cros_ec_spi_pm_ops),
 	},
 	.probe		= cros_ec_spi_probe,
 	.remove		= cros_ec_spi_remove,
diff --git a/drivers/platform/chrome/cros_usbpd_logger.c b/drivers/platform/chrome/cros_usbpd_logger.c
index d16931203d8216..9df5a146df2fc0 100644
--- a/drivers/platform/chrome/cros_usbpd_logger.c
+++ b/drivers/platform/chrome/cros_usbpd_logger.c
@@ -229,7 +229,7 @@ static int cros_usbpd_logger_remove(struct platform_device *pd)
 	return 0;
 }
 
-static int __maybe_unused cros_usbpd_logger_resume(struct device *dev)
+static int cros_usbpd_logger_resume(struct device *dev)
 {
 	struct logger_data *logger = dev_get_drvdata(dev);
 
@@ -239,7 +239,7 @@ static int __maybe_unused cros_usbpd_logger_resume(struct device *dev)
 	return 0;
 }
 
-static int __maybe_unused cros_usbpd_logger_suspend(struct device *dev)
+static int cros_usbpd_logger_suspend(struct device *dev)
 {
 	struct logger_data *logger = dev_get_drvdata(dev);
 
@@ -248,13 +248,13 @@ static int __maybe_unused cros_usbpd_logger_suspend(struct device *dev)
 	return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(cros_usbpd_logger_pm_ops, cros_usbpd_logger_suspend,
+DEFINE_SIMPLE_DEV_PM_OPS(cros_usbpd_logger_pm_ops, cros_usbpd_logger_suspend,
 			 cros_usbpd_logger_resume);
 
 static struct platform_driver cros_usbpd_logger_driver = {
 	.driver = {
 		.name = DRV_NAME,
-		.pm = &cros_usbpd_logger_pm_ops,
+		.pm = pm_sleep_ptr(&cros_usbpd_logger_pm_ops),
 	},
 	.probe = cros_usbpd_logger_probe,
 	.remove = cros_usbpd_logger_remove,
-- 
2.34.1.448.ga2b2bfdf31-goog

[PATCH 3/3] plaform/chrome: Remove SET_LATE_SYSTEM_SLEEP_PM_OPS

[Gwendal Grignou]

commit 296282fca791 ("PM: core: Add new *_PM_OPS macros, deprecate old ones")
introduces LATE_SYSTEM_SLEEP_PM_OPS, so we can remove the #ifdef around
suspend/resume functions.

Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
---
 drivers/platform/chrome/cros_ec_i2c.c | 6 ++----
 drivers/platform/chrome/cros_ec_lpc.c | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/platform/chrome/cros_ec_i2c.c b/drivers/platform/chrome/cros_ec_i2c.c
index 30c8938c27d54e..b27c15f6774cc9 100644
--- a/drivers/platform/chrome/cros_ec_i2c.c
+++ b/drivers/platform/chrome/cros_ec_i2c.c
@@ -316,7 +316,6 @@ static int cros_ec_i2c_remove(struct i2c_client *client)
 	return cros_ec_unregister(ec_dev);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int cros_ec_i2c_suspend(struct device *dev)
 {
 	struct cros_ec_device *ec_dev = to_ec_dev(dev);
@@ -330,10 +329,9 @@ static int cros_ec_i2c_resume(struct device *dev)
 
 	return cros_ec_resume(ec_dev);
 }
-#endif
 
 static const struct dev_pm_ops cros_ec_i2c_pm_ops = {
-	SET_LATE_SYSTEM_SLEEP_PM_OPS(cros_ec_i2c_suspend, cros_ec_i2c_resume)
+	LATE_SYSTEM_SLEEP_PM_OPS(cros_ec_i2c_suspend, cros_ec_i2c_resume)
 };
 
 #ifdef CONFIG_OF
@@ -363,7 +361,7 @@ static struct i2c_driver cros_ec_driver = {
 		.name	= "cros-ec-i2c",
 		.acpi_match_table = ACPI_PTR(cros_ec_i2c_acpi_id),
 		.of_match_table = of_match_ptr(cros_ec_i2c_of_match),
-		.pm	= &cros_ec_i2c_pm_ops,
+		.pm	= pm_sleep_ptr(&cros_ec_i2c_pm_ops),
 	},
 	.probe		= cros_ec_i2c_probe,
 	.remove		= cros_ec_i2c_remove,
diff --git a/drivers/platform/chrome/cros_ec_lpc.c b/drivers/platform/chrome/cros_ec_lpc.c
index d6306d2a096f13..91b4f9dad069b1 100644
--- a/drivers/platform/chrome/cros_ec_lpc.c
+++ b/drivers/platform/chrome/cros_ec_lpc.c
@@ -504,7 +504,6 @@ static const struct dmi_system_id cros_ec_lpc_dmi_table[] __initconst = {
 };
 MODULE_DEVICE_TABLE(dmi, cros_ec_lpc_dmi_table);
 
-#ifdef CONFIG_PM_SLEEP
 static int cros_ec_lpc_suspend(struct device *dev)
 {
 	struct cros_ec_device *ec_dev = dev_get_drvdata(dev);
@@ -518,17 +517,16 @@ static int cros_ec_lpc_resume(struct device *dev)
 
 	return cros_ec_resume(ec_dev);
 }
-#endif
 
 static const struct dev_pm_ops cros_ec_lpc_pm_ops = {
-	SET_LATE_SYSTEM_SLEEP_PM_OPS(cros_ec_lpc_suspend, cros_ec_lpc_resume)
+	LATE_SYSTEM_SLEEP_PM_OPS(cros_ec_lpc_suspend, cros_ec_lpc_resume)
 };
 
 static struct platform_driver cros_ec_lpc_driver = {
 	.driver = {
 		.name = DRV_NAME,
 		.acpi_match_table = cros_ec_lpc_acpi_device_ids,
-		.pm = &cros_ec_lpc_pm_ops,
+		.pm = pm_sleep_ptr(&cros_ec_lpc_pm_ops),
 	},
 	.probe = cros_ec_lpc_probe,
 	.remove = cros_ec_lpc_remove,
-- 
2.34.1.448.ga2b2bfdf31-goog