write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/drivers/watchdog/i6300esb.c
..
..
@@ -1,13 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  *	i6300esb:	Watchdog timer driver for Intel 6300ESB chipset
3
4
  *
4
5
  *	(c) Copyright 2004 Google Inc.
5
6
  *	(c) Copyright 2005 David Härdeman <david@2gen.com>
6
- *
7
- *	This program is free software; you can redistribute it and/or
8
- *	modify it under the terms of the GNU General Public License
9
- *	as published by the Free Software Foundation; either version
10
- *	2 of the License, or (at your option) any later version.
11
7
  *
12
8
  *	based on i810-tco.c which is in turn based on softdog.c
13
9
  *
..
..
@@ -311,10 +307,7 @@
311
307
 	edev->wdd.min_timeout = ESB_HEARTBEAT_MIN;
312
308
 	edev->wdd.max_timeout = ESB_HEARTBEAT_MAX;
313
309
 	edev->wdd.timeout = ESB_HEARTBEAT_DEFAULT;
314
-	if (watchdog_init_timeout(&edev->wdd, heartbeat, NULL))
315
-		dev_info(&pdev->dev,
316
-			"heartbeat value must be " ESB_HEARTBEAT_RANGE
317
-			", using %u\n", edev->wdd.timeout);
310
+	watchdog_init_timeout(&edev->wdd, heartbeat, NULL);
318
311
 	watchdog_set_nowayout(&edev->wdd, nowayout);
319
312
 	watchdog_stop_on_reboot(&edev->wdd);
320
313
 	watchdog_stop_on_unregister(&edev->wdd);
..
..
@@ -322,14 +315,11 @@
322
315
 
323
316
 	/* Register the watchdog so that userspace has access to it */
324
317
 	ret = watchdog_register_device(&edev->wdd);
325
-	if (ret != 0) {
326
-		dev_err(&pdev->dev,
327
-			"cannot register watchdog device (err=%d)\n", ret);
318
+	if (ret != 0)
328
319
 		goto err_unmap;
329
-	}
330
320
 	dev_info(&pdev->dev,
331
-		"initialized (0x%p). heartbeat=%d sec (nowayout=%d)\n",
332
-		edev->base, edev->wdd.timeout, nowayout);
321
+		"initialized. heartbeat=%d sec (nowayout=%d)\n",
322
+		edev->wdd.timeout, nowayout);
333
323
 	return 0;
334
324
 
335
325
 err_unmap: