[patch 2.6.19-git] watchdog: at91_wdt build fix

[patch 2.6.19-git] watchdog: at91_wdt build fix

[David Brownell]

Recent miscdev changes broke various drivers, so they won't build.
This fixes another one.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>

Index: at91/drivers/char/watchdog/at91rm9200_wdt.c
===================================================================
--- at91.orig/drivers/char/watchdog/at91rm9200_wdt.c	2006-12-07 21:37:00.000000000 -0800
+++ at91/drivers/char/watchdog/at91rm9200_wdt.c	2006-12-07 21:38:28.000000000 -0800
@@ -203,9 +203,9 @@ static int __init at91wdt_probe(struct p
 {
 	int res;
 
-	if (at91wdt_miscdev.dev)
+	if (at91wdt_miscdev.parent)
 		return -EBUSY;
-	at91wdt_miscdev.dev = &pdev->dev;
+	at91wdt_miscdev.parent = &pdev->dev;
 
 	res = misc_register(&at91wdt_miscdev);
 	if (res)
@@ -221,7 +221,7 @@ static int __exit at91wdt_remove(struct 
 
 	res = misc_deregister(&at91wdt_miscdev);
 	if (!res)
-		at91wdt_miscdev.dev = NULL;
+		at91wdt_miscdev.parent = NULL;
 
 	return res;
 }

Re: [patch 2.6.19-git] watchdog: at91_wdt build fix

[Wim Van Sebroeck]

Hi David,

> Recent miscdev changes broke various drivers, so they won't build.
> This fixes another one.

See also Andrew Victor's patch (dated 04/Dec/2006) in the
linux-2.6-watchdog tree. It's indeed the at91rm9200_wdt, the mpcore_wdt
and the omap_wdt that are affected by the miscdev changes
(See Driver core: change misc class_devices to be real devices
http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=94fbcded4ea0dc14cbfb222a5c68372f150d1476 )

Greetings,
Wim.

Re: [patch 2.6.19-git] watchdog: at91_wdt build fix

[David Brownell]

On Sunday 10 December 2006 11:23 am, Wim Van Sebroeck wrote:
> Hi David,
> 
> > Recent miscdev changes broke various drivers, so they won't build.
> > This fixes another one.
> 
> See also Andrew Victor's patch (dated 04/Dec/2006) in the
> linux-2.6-watchdog tree. It's indeed the at91rm9200_wdt, the mpcore_wdt
> and the omap_wdt that are affected by the miscdev changes

I was just following the "fix brown paper bags ASAP" policy.
One that seems followed less closely than usual in the current
kernel tree.  :(


> (See Driver core: change misc class_devices to be real devices
> http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=94fbcded4ea0dc14cbfb222a5c68372f150d1476 )

Hmm, I'm a bit surprised that not all the watchdog drivers have
this issue.  Is the problem that most of them don't actually
adhere to the driver model ... that is, most don't have any kind
of (platform or other) device backing the watchdog?

- Dave

Re: [patch 2.6.19-git] watchdog: at91_wdt build fix

[Wim Van Sebroeck]

Hi David,

> > See also Andrew Victor's patch (dated 04/Dec/2006) in the
> > linux-2.6-watchdog tree. It's indeed the at91rm9200_wdt, the mpcore_wdt
> > and the omap_wdt that are affected by the miscdev changes
> 
> I was just following the "fix brown paper bags ASAP" policy.
> One that seems followed less closely than usual in the current
> kernel tree.  :(

Hmmmm, if I re-read this then my original message wasn't really clear...
I actually wanted to say that I already included Andrew's patches and
because of that I didn't add your patches also. Sorry about that. 
But you're right: we need to fix things as soon as possible.

> Hmm, I'm a bit surprised that not all the watchdog drivers have
> this issue.  Is the problem that most of them don't actually
> adhere to the driver model ... that is, most don't have any kind
> of (platform or other) device backing the watchdog?

Most of them don't have the driver model yet and those who have
don't use the miscdev as a "parent". But this is on the roadmap 
as part of the conversion to the generic watchdog structure.
(Hmm, I need to talk to Rudolf Marek again and continue our
conversation about the generic watchdog functionsi -> will do
that tomorrow).

Greetings,
Wim.