Re: [PATCH] Watchdog device node name unification

[Henrik Brix Andersen]

On Sat, 2005-08-13 at 23:36 +0200, Henrik Brix Andersen wrote:
> Here's a patch for unifying the watchdog device node name
> to /dev/watchdog as expected by most user-space applications.
> 
> Please CC: me on replies as I am not subscribed to LKML.
> 
> 
> Signed-off-by: Henrik Brix Andersen <brix@xxxxxxxxxx>

The last patch was accidentally against 2.6.12 - this one is against
2.6.13-rc6.


diff -urp linux-2.6.13-rc6/drivers/char/watchdog/ixp2000_wdt.c linux-2.6.13-rc6-watchdog/drivers/char/watchdog/ixp2000_wdt.c
--- linux-2.6.13-rc6/drivers/char/watchdog/ixp2000_wdt.c	2005-08-13 23:48:02.000000000 +0200
+++ linux-2.6.13-rc6-watchdog/drivers/char/watchdog/ixp2000_wdt.c	2005-08-13 23:50:17.000000000 +0200
@@ -182,7 +182,7 @@ static struct file_operations ixp2000_wd
 static struct miscdevice ixp2000_wdt_miscdev =
 {
 	.minor		= WATCHDOG_MINOR,
-	.name		= "IXP2000 Watchdog",
+	.name		= "watchdog",
 	.fops		= &ixp2000_wdt_fops,
 };
 
diff -urp linux-2.6.13-rc6/drivers/char/watchdog/ixp4xx_wdt.c linux-2.6.13-rc6-watchdog/drivers/char/watchdog/ixp4xx_wdt.c
--- linux-2.6.13-rc6/drivers/char/watchdog/ixp4xx_wdt.c	2005-08-13 23:48:02.000000000 +0200
+++ linux-2.6.13-rc6-watchdog/drivers/char/watchdog/ixp4xx_wdt.c	2005-08-13 23:50:17.000000000 +0200
@@ -176,7 +176,7 @@ static struct file_operations ixp4xx_wdt
 static struct miscdevice ixp4xx_wdt_miscdev =
 {
 	.minor		= WATCHDOG_MINOR,
-	.name		= "IXP4xx Watchdog",
+	.name		= "watchdog",
 	.fops		= &ixp4xx_wdt_fops,
 };
 
diff -urp linux-2.6.13-rc6/drivers/char/watchdog/scx200_wdt.c linux-2.6.13-rc6-watchdog/drivers/char/watchdog/scx200_wdt.c
--- linux-2.6.13-rc6/drivers/char/watchdog/scx200_wdt.c	2005-08-13 23:48:02.000000000 +0200
+++ linux-2.6.13-rc6-watchdog/drivers/char/watchdog/scx200_wdt.c	2005-08-13 23:50:21.000000000 +0200
@@ -206,7 +206,7 @@ static struct file_operations scx200_wdt
 
 static struct miscdevice scx200_wdt_miscdev = {
 	.minor = WATCHDOG_MINOR,
-	.name  = NAME,
+	.name  = "watchdog",
 	.fops  = &scx200_wdt_fops,
 };
 


-- 
Henrik Brix Andersen <brix@xxxxxxxxxx>
Gentoo Metadistribution | Mobile computing herd

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/