forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'linux-watchdog-5.11-rc1' of git://www.linux-watchdog.org/l…
…inux-watchdog Pull watchdog updates from Wim Van Sebroeck: - Removal of the pnx83xx driver - Add a binding for A100's watchdog controller - Add Rockchip compatibles to snps,dw-wdt.yaml - hpwdt: Disable NMI in Crash Kernel - Fix potential dereferencing of null pointer in watchdog_core - Several other small fixes and improvements * tag 'linux-watchdog-5.11-rc1' of git://www.linux-watchdog.org/linux-watchdog: (23 commits) watchdog: convert comma to semicolon watchdog: iTCO_wdt: use dev_*() instead of pr_*() for logging dt-binding: watchdog: add Rockchip compatibles to snps,dw-wdt.yaml watchdog: coh901327: add COMMON_CLK dependency dt-bindings: watchdog: sun4i: Add A100 compatible watchdog: qcom: Avoid context switch in restart handler watchdog: iTCO_wdt: use module_platform_device() macro watchdog: Fix potential dereferencing of null pointer watchdog: wdat_wdt: Fix missing kerneldoc reported by W=1 watchdog/hpwdt: Reflect changes watchdog/hpwdt: Disable NMI in Crash Kernel wdt: sp805: add watchdog_stop on reboot watchdog: sbc_fitpc2_wdt: add __user annotations watchdog: geodewdt: remove unneeded break watchdog: rti-wdt: fix reference leak in rti_wdt_probe watchdog: qcom_wdt: set WDOG_HW_RUNNING bit when appropriate watchdog: remove pnx83xx driver watchdog: stm32_iwdg: don't print an error on probe deferral watchdog: sprd: change to use usleep_range() instead of busy loop watchdog: sprd: check busy bit before new loading rather than after that ...
- Loading branch information
Showing
17 changed files
with
104 additions
and
370 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,8 +40,6 @@ | |
| * Includes, defines, variables, module parameters, ... | ||
| */ | ||
|
|
||
| #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
|
|
||
| /* Module and version information */ | ||
| #define DRV_NAME "iTCO_wdt" | ||
| #define DRV_VERSION "1.11" | ||
|
|
@@ -279,7 +277,7 @@ static int iTCO_wdt_start(struct watchdog_device *wd_dev) | |
| /* disable chipset's NO_REBOOT bit */ | ||
| if (p->update_no_reboot_bit(p->no_reboot_priv, false)) { | ||
| spin_unlock(&p->io_lock); | ||
| pr_err("failed to reset NO_REBOOT flag, reboot disabled by hardware/BIOS\n"); | ||
| dev_err(wd_dev->parent, "failed to reset NO_REBOOT flag, reboot disabled by hardware/BIOS\n"); | ||
| return -EIO; | ||
| } | ||
|
|
||
|
|
@@ -510,7 +508,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev) | |
| /* Check chipset's NO_REBOOT bit */ | ||
| if (p->update_no_reboot_bit(p->no_reboot_priv, false) && | ||
| iTCO_vendor_check_noreboot_on()) { | ||
| pr_info("unable to reset NO_REBOOT flag, device disabled by hardware/BIOS\n"); | ||
| dev_info(dev, "unable to reset NO_REBOOT flag, device disabled by hardware/BIOS\n"); | ||
| return -ENODEV; /* Cannot reset NO_REBOOT bit */ | ||
| } | ||
|
|
||
|
|
@@ -530,12 +528,12 @@ static int iTCO_wdt_probe(struct platform_device *pdev) | |
| if (!devm_request_region(dev, p->tco_res->start, | ||
| resource_size(p->tco_res), | ||
| pdev->name)) { | ||
| pr_err("I/O address 0x%04llx already in use, device disabled\n", | ||
| dev_err(dev, "I/O address 0x%04llx already in use, device disabled\n", | ||
| (u64)TCOBASE(p)); | ||
| return -EBUSY; | ||
| } | ||
|
|
||
| pr_info("Found a %s TCO device (Version=%d, TCOBASE=0x%04llx)\n", | ||
| dev_info(dev, "Found a %s TCO device (Version=%d, TCOBASE=0x%04llx)\n", | ||
| pdata->name, pdata->version, (u64)TCOBASE(p)); | ||
|
|
||
| /* Clear out the (probably old) status */ | ||
|
|
@@ -558,7 +556,7 @@ static int iTCO_wdt_probe(struct platform_device *pdev) | |
| break; | ||
| } | ||
|
|
||
| p->wddev.info = &ident, | ||
| p->wddev.info = &ident, | ||
| p->wddev.ops = &iTCO_wdt_ops, | ||
| p->wddev.bootstatus = 0; | ||
| p->wddev.timeout = WATCHDOG_TIMEOUT; | ||
|
|
@@ -575,19 +573,19 @@ static int iTCO_wdt_probe(struct platform_device *pdev) | |
| if not reset to the default */ | ||
| if (iTCO_wdt_set_timeout(&p->wddev, heartbeat)) { | ||
| iTCO_wdt_set_timeout(&p->wddev, WATCHDOG_TIMEOUT); | ||
| pr_info("timeout value out of range, using %d\n", | ||
| dev_info(dev, "timeout value out of range, using %d\n", | ||
| WATCHDOG_TIMEOUT); | ||
| } | ||
|
|
||
| watchdog_stop_on_reboot(&p->wddev); | ||
| watchdog_stop_on_unregister(&p->wddev); | ||
| ret = devm_watchdog_register_device(dev, &p->wddev); | ||
| if (ret != 0) { | ||
| pr_err("cannot register watchdog device (err=%d)\n", ret); | ||
| dev_err(dev, "cannot register watchdog device (err=%d)\n", ret); | ||
| return ret; | ||
| } | ||
|
|
||
| pr_info("initialized. heartbeat=%d sec (nowayout=%d)\n", | ||
| dev_info(dev, "initialized. heartbeat=%d sec (nowayout=%d)\n", | ||
| heartbeat, nowayout); | ||
|
|
||
| return 0; | ||
|
|
@@ -651,21 +649,7 @@ static struct platform_driver iTCO_wdt_driver = { | |
| }, | ||
| }; | ||
|
|
||
| static int __init iTCO_wdt_init_module(void) | ||
| { | ||
| pr_info("Intel TCO WatchDog Timer Driver v%s\n", DRV_VERSION); | ||
|
|
||
| return platform_driver_register(&iTCO_wdt_driver); | ||
| } | ||
|
|
||
| static void __exit iTCO_wdt_cleanup_module(void) | ||
| { | ||
| platform_driver_unregister(&iTCO_wdt_driver); | ||
| pr_info("Watchdog Module Unloaded\n"); | ||
| } | ||
|
|
||
| module_init(iTCO_wdt_init_module); | ||
| module_exit(iTCO_wdt_cleanup_module); | ||
| module_platform_driver(iTCO_wdt_driver); | ||
|
|
||
| MODULE_AUTHOR("Wim Van Sebroeck <[email protected]>"); | ||
| MODULE_DESCRIPTION("Intel TCO WatchDog Timer Driver"); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.