hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/watchdog/mei_wdt.c
....@@ -385,10 +385,8 @@
385385 watchdog_stop_on_unregister(&wdt->wdd);
386386
387387 ret = watchdog_register_device(&wdt->wdd);
388
- if (ret) {
389
- dev_err(dev, "unable to register watchdog device = %d.\n", ret);
388
+ if (ret)
390389 watchdog_set_drvdata(&wdt->wdd, NULL);
391
- }
392390
393391 wdt->state = MEI_WDT_IDLE;
394392
....@@ -540,38 +538,23 @@
540538 wdt->dbgfs_dir = NULL;
541539 }
542540
543
-static int dbgfs_register(struct mei_wdt *wdt)
541
+static void dbgfs_register(struct mei_wdt *wdt)
544542 {
545
- struct dentry *dir, *f;
543
+ struct dentry *dir;
546544
547545 dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
548
- if (!dir)
549
- return -ENOMEM;
550
-
551546 wdt->dbgfs_dir = dir;
552
- f = debugfs_create_file("state", S_IRUSR, dir, wdt, &dbgfs_fops_state);
553
- if (!f)
554
- goto err;
555547
556
- f = debugfs_create_file("activation", S_IRUSR,
557
- dir, wdt, &dbgfs_fops_activation);
558
- if (!f)
559
- goto err;
548
+ debugfs_create_file("state", S_IRUSR, dir, wdt, &dbgfs_fops_state);
560549
561
- return 0;
562
-err:
563
- dbgfs_unregister(wdt);
564
- return -ENODEV;
550
+ debugfs_create_file("activation", S_IRUSR, dir, wdt,
551
+ &dbgfs_fops_activation);
565552 }
566553
567554 #else
568555
569556 static inline void dbgfs_unregister(struct mei_wdt *wdt) {}
570
-
571
-static inline int dbgfs_register(struct mei_wdt *wdt)
572
-{
573
- return 0;
574
-}
557
+static inline void dbgfs_register(struct mei_wdt *wdt) {}
575558 #endif /* CONFIG_DEBUG_FS */
576559
577560 static int mei_wdt_probe(struct mei_cl_device *cldev,
....@@ -624,8 +607,7 @@
624607 if (ret)
625608 goto err_disable;
626609
627
- if (dbgfs_register(wdt))
628
- dev_warn(&cldev->dev, "cannot register debugfs\n");
610
+ dbgfs_register(wdt);
629611
630612 return 0;
631613