watchdog: i6300esb: remove info message and version number (788c2fdb) · Commits · 戴 / test

The initial info message (early in the esb_probe() function) is not very useful and we already have a message on successful probe, which includes device identification. If the probe fails (e.g. PCI related errors), additional messages are printed anyway. The version number was only used in the initial info message. Other than that, it serves no useful purpose and it ran out of favor upstream anyway. Signed-off-by:

Radu Rendec <rrendec@arista.com> Reviewed-by:

Guenter Roeck <linux@roeck-us.net> Signed-off-by:

Wim Van Sebroeck <wim@iguana.be>

drivers/watchdog/i6300esb.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -30,8 +30,6 @@
		* Includes, defines, variables, module parameters, ...
		*/

		#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

		#include <linux/module.h>
		#include <linux/types.h>
		#include <linux/kernel.h>
		@@ -45,7 +43,6 @@
		#include <linux/io.h>

		/* Module and version information */
		#define ESB_VERSION "0.05"
		#define ESB_MODULE_NAME "i6300ESB timer"

		/* PCI configuration registers */
		@@ -76,9 +73,6 @@
		#define ESB_UNLOCK1 0x80 /* Step 1 to unlock reset registers */
		#define ESB_UNLOCK2 0x86 /* Step 2 to unlock reset registers */

		/* Probed devices counter; used only for printing the initial info message */
		static int cards_found;

		/* module parameters */
		/* 30 sec default heartbeat (1 < heartbeat < 21023) /
		#define ESB_HEARTBEAT_MIN 1
		@@ -302,11 +296,6 @@ static int esb_probe(struct pci_dev *pdev,
		struct esb_dev *edev;
		int ret;

		cards_found++;
		if (cards_found == 1)
		pr_info("Intel 6300ESB WatchDog Timer Driver v%s\n",
		ESB_VERSION);

		edev = devm_kzalloc(&pdev->dev, sizeof(*edev), GFP_KERNEL);
		if (!edev)
		return -ENOMEM;

Admin message