Update of /cvsroot/linux-mips/linux/drivers/char
In directory usw-pr-cvs1:/tmp/cvs-serv7674
Modified Files:
vr41xxwdt.c
Log Message:
MINOR() -> minor(), and some other general cleanup.
Index: vr41xxwdt.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/char/vr41xxwdt.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vr41xxwdt.c 20 Jan 2002 03:26:07 -0000 1.4
+++ vr41xxwdt.c 12 Feb 2002 22:03:37 -0000 1.5
@@ -128,17 +128,12 @@
*/
static int vr41xx_wdt_open(struct inode *inode, struct file *file)
{
- switch (MINOR(inode->i_rdev)) {
- case WATCHDOG_MINOR:
- if (test_and_set_bit(0, &vr41xx_wdt_is_open))
- return -EBUSY;
-
- vr41xx_wdt_start();
+ if (minor(inode->i_rdev) != WATCHDOG_MINOR)
+ return -ENODEV;
+ if (test_and_set_bit(0, &vr41xx_wdt_is_open))
+ return -EBUSY;
- break;
- default:
- return -ENODEV;
- }
+ vr41xx_wdt_start();
return 0;
}
@@ -153,7 +148,7 @@
*/
static int vr41xx_wdt_close(struct inode *inode, struct file *file)
{
- if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) {
+ if (minor(inode->i_rdev) == WATCHDOG_MINOR) {
#ifndef CONFIG_WATCHDOG_NOWAYOUT
vr41xx_wdt_stop();
#endif
|
