Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 143a2e54 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files

[WATCHDOG] More coding-style and trivial clean-up 



Some more cleaning-up of the watchdog drivers.

Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent d5c26a59

drivers/watchdog/advantechwdt.c

+5 −2
Original line number Diff line number Diff line
@@ -138,7 +138,9 @@ static long advwdt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	void __user *argp = (void __user *)arg;

	int __user *p = argp;

	static struct watchdog_info ident = {

		.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,

		.options = WDIOF_KEEPALIVEPING |

			   WDIOF_SETTIMEOUT |

			   WDIOF_MAGICCLOSE,

		.firmware_version = 1,

		.identity = WATCHDOG_NAME,

	};
@@ -259,7 +261,8 @@ static int __devinit advwdt_probe(struct platform_device *dev) 
		goto unreg_stop;

	}



	/* Check that the heartbeat value is within it's range ; if not reset to the default */

	/* Check that the heartbeat value is within it's range ;

	 * if not reset to the default */

	if (advwdt_set_heartbeat(timeout)) {

		advwdt_set_heartbeat(WATCHDOG_TIMEOUT);

		printk(KERN_INFO PFX

drivers/watchdog/alim7101_wdt.c

+4 −2
Original line number Diff line number Diff line
@@ -355,7 +355,8 @@ static int __init alim7101_wdt_init(void) 
	alim7101_pmu = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101,

		NULL);

	if (!alim7101_pmu) {

		printk(KERN_INFO PFX "ALi M7101 PMU not present - WDT not set\n");

		printk(KERN_INFO PFX

			"ALi M7101 PMU not present - WDT not set\n");

		return -EBUSY;

	}
@@ -399,7 +400,8 @@ static int __init alim7101_wdt_init(void) 


	rc = misc_register(&wdt_miscdev);

	if (rc) {

		printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",

		printk(KERN_ERR PFX

			"cannot register miscdev on minor=%d (err=%d)\n",

			wdt_miscdev.minor, rc);

		goto err_out_reboot;

	}

drivers/watchdog/geodewdt.c

+8 −3
Original line number Diff line number Diff line
@@ -34,11 +34,15 @@ 


static int timeout = WATCHDOG_TIMEOUT;

module_param(timeout, int, 0);

MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=131, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");

MODULE_PARM_DESC(timeout,

	"Watchdog timeout in seconds. 1<= timeout <=131, default="

				__MODULE_STRING(WATCHDOG_TIMEOUT) ".");



static int nowayout = WATCHDOG_NOWAYOUT;

module_param(nowayout, int, 0);

MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");

MODULE_PARM_DESC(nowayout,

	"Watchdog cannot be stopped once started (default="

				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");



static struct platform_device *geodewdt_platform_device;

static unsigned long wdt_flags;
@@ -269,7 +273,8 @@ static int __init geodewdt_init(void) 
	if (ret)

		return ret;



	geodewdt_platform_device = platform_device_register_simple(DRV_NAME, -1, NULL, 0);

	geodewdt_platform_device = platform_device_register_simple(DRV_NAME,

								-1, NULL, 0);

	if (IS_ERR(geodewdt_platform_device)) {

		ret = PTR_ERR(geodewdt_platform_device);

		goto err;

drivers/watchdog/hpwdt.c

+2 −1
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ static struct pci_device_id hpwdt_devices[] = { 
};

MODULE_DEVICE_TABLE(pci, hpwdt_devices);



extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs, unsigned long *pRomEntry);

extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs,

						unsigned long *pRomEntry);



#ifndef CONFIG_X86_64

/* --32 Bit Bios------------------------------------------------------------ */

drivers/watchdog/i6300esb.c

+2 −1
Original line number Diff line number Diff line
@@ -240,7 +240,8 @@ static ssize_t esb_write(struct file *file, const char __user *data, 
			 * five months ago... */

			esb_expect_close = 0;



			/* scan to see whether or not we got the magic character */

			/* scan to see whether or not we got the

			 * magic character */

			for (i = 0; i != len; i++) {

				char c;

				if (get_user(c, data + i))