| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 3 Jan 2022 22:22:12 -0800
From: Gwendal Grignou <gwendal@...omium.org>
To: bleung@...omium.org, groeck@...omium.org
Cc: linux-kernel@...r.kernel.org,
Gwendal Grignou <gwendal@...omium.org>
Subject: [PATCH 2/3] plaform/chrome: Remove SIMPLE_DEV_PM_OPS
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@...omium.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
Powered by blists - more mailing lists