]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
platform/chrome: cros_usbpd_logger: Simplify with devm
authorKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Thu, 5 Mar 2026 21:45:49 +0000 (22:45 +0100)
committerTzung-Bi Shih <tzungbi@kernel.org>
Fri, 20 Mar 2026 02:57:04 +0000 (02:57 +0000)
Simplify the driver by using devm interfaces, which allow to drop
probe() error paths and the remove() callback.

Change is not equivalent in the workqueue itself: use non-legacy API
which does not set (__WQ_LEGACY | WQ_MEM_RECLAIM).  The workqueue is
used to update logs, thus there is no point to run it for memory
reclaim.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20260305-workqueue-devm-v2-10-66a38741c652@oss.qualcomm.com
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
drivers/platform/chrome/cros_usbpd_logger.c

index 7ce75e2e039e7c4cad78a98aecf9000515e9785e..d343e1ab6f08b09c08b069140ea33d2053cbecb4 100644 (file)
@@ -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,
 };