[WATCHDOG] more coding style clean-up's (7944d3a5) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/watchdog/acquirewdt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -126,7 +126,7 @@ static ssize_t acq_write(struct file file, const char __user buf,
		if (!nowayout) {
		size_t i;
		/* note: just in case someone wrote the magic character
		* five months ago... */
		five months ago... */
		expect_close = 0;
		/* scan to see whether or not we got the
		magic character */

drivers/watchdog/advantechwdt.c

+9 −8

Original line number	Diff line number	Diff line
		@@ -47,7 +47,8 @@
		#define WATCHDOG_NAME "Advantech WDT"
		#define WATCHDOG_TIMEOUT 60 /* 60 sec default timeout */

		static struct platform_device advwdt_platform_device; / the watchdog platform device */
		/* the watchdog platform device */
		static struct platform_device *advwdt_platform_device;
		static unsigned long advwdt_is_open;
		static char adv_expect_close;

		@@ -199,8 +200,7 @@ static int advwdt_open(struct inode inode, struct file file)
		return nonseekable_open(inode, file);
		}

		static int
		advwdt_close(struct inode inode, struct file file)
		static int advwdt_close(struct inode inode, struct file file)
		{
		if (adv_expect_close == 42) {
		advwdt_disable();
		@@ -315,7 +315,8 @@ static int __init advwdt_init(void)
		{
		int err;

		printk(KERN_INFO "WDT driver for Advantech single board computer initialising.\n");
		printk(KERN_INFO
		"WDT driver for Advantech single board computer initialising.\n");

		err = platform_driver_register(&advwdt_driver);
		if (err)

drivers/watchdog/ar7_wdt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ static int ar7_wdt_notify_sys(struct notifier_block *this,
		}

		static struct notifier_block ar7_wdt_notifier = {
		.notifier_call = ar7_wdt_notify_sys
		.notifier_call = ar7_wdt_notify_sys,
		};

		static ssize_t ar7_wdt_write(struct file file, const char data,

drivers/watchdog/eurotechwdt.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -360,10 +360,8 @@ static int eurwdt_release(struct inode inode, struct file file)
		static int eurwdt_notify_sys(struct notifier_block *this, unsigned long code,
		void *unused)
		{
		if (code == SYS_DOWN \|\| code == SYS_HALT) {
		/* Turn the card off */
		eurwdt_disable_timer();
		}
		if (code == SYS_DOWN \|\| code == SYS_HALT)
		eurwdt_disable_timer(); /* Turn the card off */

		return NOTIFY_DONE;
		}

drivers/watchdog/geodewdt.c

+26 −36

Original line number	Diff line number	Diff line
		@@ -77,8 +77,7 @@ static int geodewdt_set_heartbeat(int val)
		return 0;
		}

		static int
		geodewdt_open(struct inode inode, struct file file)
		static int geodewdt_open(struct inode inode, struct file file)
		{
		if (test_and_set_bit(WDT_FLAGS_OPEN, &wdt_flags))
		return -EBUSY;
		@@ -90,14 +89,12 @@ geodewdt_open(struct inode inode, struct file file)
		return nonseekable_open(inode, file);
		}

		static int
		geodewdt_release(struct inode inode, struct file file)
		static int geodewdt_release(struct inode inode, struct file file)
		{
		if (safe_close) {
		geodewdt_disable();
		module_put(THIS_MODULE);
		}
		else {
		} else {
		printk(KERN_CRIT "Unexpected close - watchdog is not stopping.\n");
		geodewdt_ping();

		@@ -109,9 +106,8 @@ geodewdt_release(struct inode inode, struct file file)
		return 0;
		}

		static ssize_t
		geodewdt_write(struct file file, const char __user data, size_t len,
		loff_t *ppos)
		static ssize_t geodewdt_write(struct file file, const char __user data,
		size_t len, loff_t *ppos)
		{
		if (len) {
		if (!nowayout) {
		@@ -134,9 +130,8 @@ geodewdt_write(struct file file, const char __user data, size_t len,
		return len;
		}

		static int
		geodewdt_ioctl(struct inode inode, struct file file, unsigned int cmd,
		unsigned long arg)
		static int geodewdt_ioctl(struct inode inode, struct file file,
		unsigned int cmd, unsigned long arg)
		{
		void __user argp = (void __user )arg;
		int __user *p = argp;
		@@ -211,11 +206,10 @@ static const struct file_operations geodewdt_fops = {
		static struct miscdevice geodewdt_miscdev = {
		.minor = WATCHDOG_MINOR,
		.name = "watchdog",
		.fops = &geodewdt_fops
		.fops = &geodewdt_fops,
		};

		static int __devinit
		geodewdt_probe(struct platform_device *dev)
		static int __devinit geodewdt_probe(struct platform_device *dev)
		{
		int ret, timer;

		@@ -246,15 +240,13 @@ geodewdt_probe(struct platform_device *dev)
		return ret;
		}

		static int __devexit
		geodewdt_remove(struct platform_device *dev)
		static int __devexit geodewdt_remove(struct platform_device *dev)
		{
		misc_deregister(&geodewdt_miscdev);
		return 0;
		}

		static void
		geodewdt_shutdown(struct platform_device *dev)
		static void geodewdt_shutdown(struct platform_device *dev)
		{
		geodewdt_disable();
		}
		@@ -269,8 +261,7 @@ static struct platform_driver geodewdt_driver = {
		},
		};

		static int __init
		geodewdt_init(void)
		static int __init geodewdt_init(void)
		{
		int ret;

		@@ -290,8 +281,7 @@ geodewdt_init(void)
		return ret;
		}

		static void __exit
		geodewdt_exit(void)
		static void __exit geodewdt_exit(void)
		{
		platform_device_unregister(geodewdt_platform_device);
		platform_driver_unregister(&geodewdt_driver);