diff mbox series

[3/4] watchdog: da9052_wdt: do not disable wdt during probe

Message ID 20250313-da9052-fixes-v1-3-379dc87af953@gmail.com
State New
Headers show
Series Various fixes for the da9052 watchdog | expand

Commit Message

Marcus Folkesson March 13, 2025, 12:14 p.m. UTC
If the watchog is started by the bootloader, we do not want the watchdog
to be disabled.

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
 drivers/watchdog/da9052_wdt.c | 7 -------
 1 file changed, 7 deletions(-)

Comments

kernel test robot March 14, 2025, 7:32 a.m. UTC | #1
Hi Marcus,

kernel test robot noticed the following build warnings:

[auto build test WARNING on 0fed89a961ea851945d23cc35beb59d6e56c0964]

url:    https://github.com/intel-lab-lkp/linux/commits/Marcus-Folkesson/watchdog-da9052_wdt-add-support-for-nowayout/20250313-202430
base:   0fed89a961ea851945d23cc35beb59d6e56c0964
patch link:    https://lore.kernel.org/r/20250313-da9052-fixes-v1-3-379dc87af953%40gmail.com
patch subject: [PATCH 3/4] watchdog: da9052_wdt: do not disable wdt during probe
config: riscv-randconfig-001-20250314 (https://download.01.org/0day-ci/archive/20250314/202503141558.tHcAG0Q5-lkp@intel.com/config)
compiler: clang version 19.1.7 (https://github.com/llvm/llvm-project cd708029e0b2869e80abe31ddb175f7c35361f90)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250314/202503141558.tHcAG0Q5-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202503141558.tHcAG0Q5-lkp@intel.com/

All warnings (new ones prefixed by >>):

>> drivers/watchdog/da9052_wdt.c:173:6: warning: unused variable 'ret' [-Wunused-variable]
     173 |         int ret;
         |             ^~~
   1 warning generated.


vim +/ret +173 drivers/watchdog/da9052_wdt.c

664a0d7862a6b10 Ashish Jangam    2012-05-24  165  
664a0d7862a6b10 Ashish Jangam    2012-05-24  166  
2d991a164a61858 Bill Pemberton   2012-11-19  167  static int da9052_wdt_probe(struct platform_device *pdev)
664a0d7862a6b10 Ashish Jangam    2012-05-24  168  {
f7e29623e2678c5 Guenter Roeck    2019-04-08  169  	struct device *dev = &pdev->dev;
f7e29623e2678c5 Guenter Roeck    2019-04-08  170  	struct da9052 *da9052 = dev_get_drvdata(dev->parent);
664a0d7862a6b10 Ashish Jangam    2012-05-24  171  	struct da9052_wdt_data *driver_data;
664a0d7862a6b10 Ashish Jangam    2012-05-24  172  	struct watchdog_device *da9052_wdt;
664a0d7862a6b10 Ashish Jangam    2012-05-24 @173  	int ret;
664a0d7862a6b10 Ashish Jangam    2012-05-24  174  
f7e29623e2678c5 Guenter Roeck    2019-04-08  175  	driver_data = devm_kzalloc(dev, sizeof(*driver_data), GFP_KERNEL);
189c049a01c2de6 Guenter Roeck    2017-01-10  176  	if (!driver_data)
189c049a01c2de6 Guenter Roeck    2017-01-10  177  		return -ENOMEM;
664a0d7862a6b10 Ashish Jangam    2012-05-24  178  	driver_data->da9052 = da9052;
664a0d7862a6b10 Ashish Jangam    2012-05-24  179  
664a0d7862a6b10 Ashish Jangam    2012-05-24  180  	da9052_wdt = &driver_data->wdt;
664a0d7862a6b10 Ashish Jangam    2012-05-24  181  
664a0d7862a6b10 Ashish Jangam    2012-05-24  182  	da9052_wdt->timeout = DA9052_DEF_TIMEOUT;
664a0d7862a6b10 Ashish Jangam    2012-05-24  183  	da9052_wdt->info = &da9052_wdt_info;
664a0d7862a6b10 Ashish Jangam    2012-05-24  184  	da9052_wdt->ops = &da9052_wdt_ops;
f7e29623e2678c5 Guenter Roeck    2019-04-08  185  	da9052_wdt->parent = dev;
664a0d7862a6b10 Ashish Jangam    2012-05-24  186  	watchdog_set_drvdata(da9052_wdt, driver_data);
ebed370e19c893f Marcus Folkesson 2025-03-13  187  	watchdog_init_timeout(da9052_wdt, timeout, dev);
950a7a3375b3d8e Marcus Folkesson 2025-03-13  188  	watchdog_set_nowayout(da9052_wdt, nowayout);
664a0d7862a6b10 Ashish Jangam    2012-05-24  189  
651b5fde35d67a2 Marcus Folkesson 2024-12-10  190  	if (da9052->fault_log & DA9052_FAULTLOG_TWDERROR)
651b5fde35d67a2 Marcus Folkesson 2024-12-10  191  		da9052_wdt->bootstatus |= WDIOF_CARDRESET;
651b5fde35d67a2 Marcus Folkesson 2024-12-10  192  	if (da9052->fault_log & DA9052_FAULTLOG_TEMPOVER)
651b5fde35d67a2 Marcus Folkesson 2024-12-10  193  		da9052_wdt->bootstatus |= WDIOF_OVERHEAT;
651b5fde35d67a2 Marcus Folkesson 2024-12-10  194  	if (da9052->fault_log & DA9052_FAULTLOG_VDDFAULT)
651b5fde35d67a2 Marcus Folkesson 2024-12-10  195  		da9052_wdt->bootstatus |= WDIOF_POWERUNDER;
651b5fde35d67a2 Marcus Folkesson 2024-12-10  196  
60415f701fce001 Wolfram Sang     2019-05-18  197  	return devm_watchdog_register_device(dev, &driver_data->wdt);
664a0d7862a6b10 Ashish Jangam    2012-05-24  198  }
664a0d7862a6b10 Ashish Jangam    2012-05-24  199
diff mbox series

Patch

diff --git a/drivers/watchdog/da9052_wdt.c b/drivers/watchdog/da9052_wdt.c
index fa9078d4c136a52f1193768fe93dc04189519679..90b620b11b5fb634372e18ce4c40568cd946f284 100644
--- a/drivers/watchdog/da9052_wdt.c
+++ b/drivers/watchdog/da9052_wdt.c
@@ -194,13 +194,6 @@  static int da9052_wdt_probe(struct platform_device *pdev)
 	if (da9052->fault_log & DA9052_FAULTLOG_VDDFAULT)
 		da9052_wdt->bootstatus |= WDIOF_POWERUNDER;
 
-	ret = da9052_reg_update(da9052, DA9052_CONTROL_D_REG,
-				DA9052_CONTROLD_TWDSCALE, 0);
-	if (ret < 0) {
-		dev_err(dev, "Failed to disable watchdog bits, %d\n", ret);
-		return ret;
-	}
-
 	return devm_watchdog_register_device(dev, &driver_data->wdt);
 }