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

Commit 5bbcbeca authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: watchdog driver formatting 



Whitespace and style fixes.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 42d36115

arch/um/drivers/harddog_kern.c

+11 −22
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ static ssize_t harddog_write(struct file *file, const char __user *data, size_t 
	 *	Refresh the timer.

	 *	Refresh the timer.

	 */

	 */

	if(len)

	if(len)

		return(ping_watchdog(harddog_out_fd));

		return ping_watchdog(harddog_out_fd);

	return 0;

	return 0;

}

}
@@ -141,7 +141,7 @@ static int harddog_ioctl(struct inode *inode, struct file *file, 
		case WDIOC_GETBOOTSTATUS:

		case WDIOC_GETBOOTSTATUS:

			return put_user(0,(int __user *)argp);

			return put_user(0,(int __user *)argp);

		case WDIOC_KEEPALIVE:

		case WDIOC_KEEPALIVE:

			return(ping_watchdog(harddog_out_fd));

			return ping_watchdog(harddog_out_fd);

	}

	}

}

}
@@ -172,7 +172,7 @@ static int __init harddog_init(void) 




	printk(banner);

	printk(banner);





	return(0);

	return 0;

}

}





static void __exit harddog_exit(void)

static void __exit harddog_exit(void)
@@ -182,14 +182,3 @@ static void __exit harddog_exit(void) 




module_init(harddog_init);

module_init(harddog_init);

module_exit(harddog_exit);
 
module_exit(harddog_exit);
 


/*

 * Overrides for Emacs so that we follow Linus's tabbing style.

 * Emacs will notice this stuff at the end of the file and automatically

 * adjust the settings for this buffer only.  This must remain at the end

 * of the file.

 * ---------------------------------------------------------------------------

 * Local variables:

 * c-file-style: "linux"

 * End:

 */

arch/um/drivers/harddog_user.c

+6 −17
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock) 
	}

	}

	*in_fd_ret = in_fds[0];

	*in_fd_ret = in_fds[0];

	*out_fd_ret = out_fds[1];

	*out_fd_ret = out_fds[1];

	return(0);

	return 0;





 out_close_in:

 out_close_in:

	os_close_file(in_fds[0]);

	os_close_file(in_fds[0]);
@@ -105,7 +105,7 @@ int start_watchdog(int *in_fd_ret, int *out_fd_ret, char *sock) 
	os_close_file(out_fds[0]);

	os_close_file(out_fds[0]);

	os_close_file(out_fds[1]);

	os_close_file(out_fds[1]);

 out:

 out:

	return(err);

	return err;

}

}





void stop_watchdog(int in_fd, int out_fd)

void stop_watchdog(int in_fd, int out_fd)
@@ -123,20 +123,9 @@ int ping_watchdog(int fd) 
	if(n != sizeof(c)){

	if(n != sizeof(c)){

		printk("ping_watchdog - write failed, err = %d\n", -n);

		printk("ping_watchdog - write failed, err = %d\n", -n);

		if(n < 0)

		if(n < 0)

			return(n);

			return n;

		return(-EIO);

		return -EIO;

	}

	}

	return 1;

	return 1;





}
 
}
 


/*

 * Overrides for Emacs so that we follow Linus's tabbing style.

 * Emacs will notice this stuff at the end of the file and automatically

 * adjust the settings for this buffer only.  This must remain at the end

 * of the file.

 * ---------------------------------------------------------------------------

 * Local variables:

 * c-file-style: "linux"

 * End:

 */