[PATCH] Watchdog device node name unification

[PATCH] Watchdog device node name unification

[Henrik Brix Andersen]

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@gentoo.org>


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-06-17 21:48:29.000000000 +0200
+++ linux-2.6.13-rc6-watchdog/drivers/char/watchdog/ixp2000_wdt.c	2005-08-13 23:10:22.000000000 +0200
@@ -186,7 +186,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-06-17 21:48:29.000000000 +0200
+++ linux-2.6.13-rc6-watchdog/drivers/char/watchdog/ixp4xx_wdt.c	2005-08-13 23:10:33.000000000 +0200
@@ -180,7 +180,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/sa1100_wdt.c linux-2.6.13-rc6-watchdog/drivers/char/watchdog/sa1100_wdt.c
--- linux-2.6.13-rc6/drivers/char/watchdog/sa1100_wdt.c	2005-06-17 21:48:29.000000000 +0200
+++ linux-2.6.13-rc6-watchdog/drivers/char/watchdog/sa1100_wdt.c	2005-08-13 23:14:05.000000000 +0200
@@ -176,7 +176,7 @@ static struct file_operations sa1100dog_
 static struct miscdevice sa1100dog_miscdev =
 {
 	.minor		= WATCHDOG_MINOR,
-	.name		= "SA1100/PXA2xx watchdog",
+	.name		= "watchdog",
 	.fops		= &sa1100dog_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-06-17 21:48:29.000000000 +0200
+++ linux-2.6.13-rc6-watchdog/drivers/char/watchdog/scx200_wdt.c	2005-08-13 23:14:33.000000000 +0200
@@ -210,7 +210,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@gentoo.org>
Gentoo Metadistribution | Mobile computing herd

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@gentoo.org>

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@gentoo.org>
Gentoo Metadistribution | Mobile computing herd

Re: [PATCH] Watchdog device node name unification

[Linus Torvalds]

On Sat, 13 Aug 2005, Henrik Brix Andersen wrote:
> 
> The last patch was accidentally against 2.6.12 - this one is against
> 2.6.13-rc6.

Doesn't seem to be serious enough to be worth it at this late stage in the 
2.6.13 game. Can you re-send after I do a release?

		Linus

Re: [PATCH] Watchdog device node name unification

[Henrik Brix Andersen]

[-- Attachment #1: Type: text/plain, Size: 516 bytes --]

On Sat, 2005-08-13 at 15:21 -0700, Linus Torvalds wrote:
> On Sat, 13 Aug 2005, Henrik Brix Andersen wrote:
> > 
> > The last patch was accidentally against 2.6.12 - this one is against
> > 2.6.13-rc6.
> 
> Doesn't seem to be serious enough to be worth it at this late stage in the 
> 2.6.13 game. Can you re-send after I do a release?

Certainly. I will resend after 2.6.13 has been released.

Regards,
Brix
-- 
Henrik Brix Andersen <brix@gentoo.org>
Gentoo Metadistribution | Mobile computing herd

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] Watchdog device node name unification

[Olaf Hering]

 On Sat, Aug 13, Henrik Brix Andersen wrote:

> 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@gentoo.org>
> 
> The last patch was accidentally against 2.6.12 - this one is against
> 2.6.13-rc6.

A patch like that is sitting in -mm since almost 5 months. I wonder why
it was never merged.

Re: [PATCH] Watchdog device node name unification

[Christoph Hellwig]

On Sat, Aug 13, 2005 at 11:36:55PM +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.

Please don't.  misdevice.name is a description of the device, and doesn't
have any relation with the name of the device node.

Re: [PATCH] Watchdog device node name unification

[Olaf Hering]

 On Sun, Aug 14, Christoph Hellwig wrote:

> On Sat, Aug 13, 2005 at 11:36:55PM +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.
> 
> Please don't.  misdevice.name is a description of the device, and doesn't
> have any relation with the name of the device node.

It is used for /class/misc/$name/dev

Re: [PATCH] Watchdog device node name unification

[Henrik Brix Andersen]

[-- Attachment #1: Type: text/plain, Size: 470 bytes --]

On Sun, 2005-08-14 at 01:43 +0200, Olaf Hering wrote:
>  On Sun, Aug 14, Christoph Hellwig wrote:
> > Please don't.  misdevice.name is a description of the device, and doesn't
> > have any relation with the name of the device node.
> 
> It is used for /class/misc/$name/dev

... and for udev-enabled systems, it's the name of the device node to be
created.

./Brix
-- 
Henrik Brix Andersen <brix@gentoo.org>
Gentoo Metadistribution | Mobile computing herd

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] Watchdog device node name unification

[Chris Wedgwood]

On Sun, Aug 14, 2005 at 01:43:22AM +0200, Olaf Hering wrote:

> It is used for /class/misc/$name/dev

Ick.  I would almost suggest we change that were it not too late.  I
think keeping the decription is useful and desirable.

Re: [PATCH] Watchdog device node name unification

[Christoph Hellwig]

On Sun, Aug 14, 2005 at 02:22:41AM +0200, Henrik Brix Andersen wrote:
> On Sun, 2005-08-14 at 01:43 +0200, Olaf Hering wrote:
> >  On Sun, Aug 14, Christoph Hellwig wrote:
> > > Please don't.  misdevice.name is a description of the device, and doesn't
> > > have any relation with the name of the device node.
> > 
> > It is used for /class/misc/$name/dev
> 
> ... and for udev-enabled systems, it's the name of the device node to be
> created.

Looks like people never learn.  We had horrible problems with devfs because
it decided to overload existing name fields, but the udev brigade does the same
idiocy again..

Re: [PATCH] Watchdog device node name unification

[Olaf Hering]

 On Sat, Aug 13, Chris Wedgwood wrote:

> On Sun, Aug 14, 2005 at 01:43:22AM +0200, Olaf Hering wrote:
> 
> > It is used for /class/misc/$name/dev
> 
> Ick.  I would almost suggest we change that were it not too late.  I
> think keeping the decription is useful and desirable.

Where is the description visible?

Re: [PATCH] Watchdog device node name unification

[Christoph Hellwig]

On Sun, Aug 14, 2005 at 11:03:24AM +0200, Olaf Hering wrote:
>  On Sat, Aug 13, Chris Wedgwood wrote:
> 
> > On Sun, Aug 14, 2005 at 01:43:22AM +0200, Olaf Hering wrote:
> > 
> > > It is used for /class/misc/$name/dev
> > 
> > Ick.  I would almost suggest we change that were it not too late.  I
> > think keeping the decription is useful and desirable.
> 
> Where is the description visible?

/proc/misc

Re: [PATCH] Watchdog device node name unification

[Chris Wedgwood]

On Sun, Aug 14, 2005 at 09:47:15AM +0100, Christoph Hellwig wrote:

> Looks like people never learn.  We had horrible problems with devfs
> because it decided to overload existing name fields, but the udev
> brigade does the same idiocy again..

It's not too late to fix this.  We can add a new field and rename the
old one with minimal effort.

Re: [PATCH] Watchdog device node name unification

[Henrik Brix Andersen]

[-- Attachment #1: Type: text/plain, Size: 2177 bytes --]

On Sat, 2005-08-13 at 15:21 -0700, Linus Torvalds wrote:
> Doesn't seem to be serious enough to be worth it at this late stage in the 
> 2.6.13 game. Can you re-send after I do a release?

Resending as requested:

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@gentoo.org>


diff -Nurp linux-2.6.13/drivers/char/watchdog/ixp2000_wdt.c linux-2.6.13-watchdog/drivers/char/watchdog/ixp2000_wdt.c
--- linux-2.6.13/drivers/char/watchdog/ixp2000_wdt.c	2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13-watchdog/drivers/char/watchdog/ixp2000_wdt.c	2005-08-29 12:28:31.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 -Nurp linux-2.6.13/drivers/char/watchdog/ixp4xx_wdt.c linux-2.6.13-watchdog/drivers/char/watchdog/ixp4xx_wdt.c
--- linux-2.6.13/drivers/char/watchdog/ixp4xx_wdt.c	2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13-watchdog/drivers/char/watchdog/ixp4xx_wdt.c	2005-08-29 12:28:31.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 -Nurp linux-2.6.13/drivers/char/watchdog/scx200_wdt.c linux-2.6.13-watchdog/drivers/char/watchdog/scx200_wdt.c
--- linux-2.6.13/drivers/char/watchdog/scx200_wdt.c	2005-08-29 01:41:01.000000000 +0200
+++ linux-2.6.13-watchdog/drivers/char/watchdog/scx200_wdt.c	2005-08-29 12:28:31.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@gentoo.org>
Gentoo Metadistribution | Mobile computing herd

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] Watchdog device node name unification

[Christoph Hellwig]

On Mon, Aug 29, 2005 at 12:32:35PM +0200, Henrik Brix Andersen wrote:
> On Sat, 2005-08-13 at 15:21 -0700, Linus Torvalds wrote:
> > Doesn't seem to be serious enough to be worth it at this late stage in the 
> > 2.6.13 game. Can you re-send after I do a release?
> 
> Resending as requested:
> 
> 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.

Again, please fix the miscdev code to no pass .name to the dev routines.
The miscdev name should be a description and has nothing to do with a
device node name.