diff options
| -rw-r--r-- | drivers/platform/chrome/cros_usbpd_logger.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/platform/chrome/cros_usbpd_logger.c b/drivers/platform/chrome/cros_usbpd_logger.c index 7ce75e2e039e..d343e1ab6f08 100644 --- a/drivers/platform/chrome/cros_usbpd_logger.c +++ b/drivers/platform/chrome/cros_usbpd_logger.c @@ -5,6 +5,7 @@ * Copyright 2018 Google LLC. */ +#include <linux/devm-helpers.h> #include <linux/ktime.h> #include <linux/math64.h> #include <linux/mod_devicetable.h> @@ -199,6 +200,7 @@ static int cros_usbpd_logger_probe(struct platform_device *pd) struct cros_ec_dev *ec_dev = dev_get_drvdata(pd->dev.parent); struct device *dev = &pd->dev; struct logger_data *logger; + int ret; logger = devm_kzalloc(dev, sizeof(*logger), GFP_KERNEL); if (!logger) @@ -210,25 +212,20 @@ static int cros_usbpd_logger_probe(struct platform_device *pd) platform_set_drvdata(pd, logger); /* Retrieve PD event logs periodically */ - INIT_DELAYED_WORK(&logger->log_work, cros_usbpd_log_check); - logger->log_workqueue = create_singlethread_workqueue("cros_usbpd_log"); + logger->log_workqueue = devm_alloc_ordered_workqueue(dev, "cros_usbpd_log", 0); if (!logger->log_workqueue) return -ENOMEM; + ret = devm_delayed_work_autocancel(dev, &logger->log_work, cros_usbpd_log_check); + if (ret) + return ret; + queue_delayed_work(logger->log_workqueue, &logger->log_work, CROS_USBPD_LOG_UPDATE_DELAY); return 0; } -static void cros_usbpd_logger_remove(struct platform_device *pd) -{ - struct logger_data *logger = platform_get_drvdata(pd); - - cancel_delayed_work_sync(&logger->log_work); - destroy_workqueue(logger->log_workqueue); -} - static int __maybe_unused cros_usbpd_logger_resume(struct device *dev) { struct logger_data *logger = dev_get_drvdata(dev); @@ -263,7 +260,6 @@ static struct platform_driver cros_usbpd_logger_driver = { .pm = &cros_usbpd_logger_pm_ops, }, .probe = cros_usbpd_logger_probe, - .remove = cros_usbpd_logger_remove, .id_table = cros_usbpd_logger_id, }; |