diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-04-13 19:12:29 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-05-18 18:10:44 -0400 |
commit | 61c7a080a5a061c976988fd4b844dfb468dda255 (patch) | |
tree | 8cb492b73f2755c38a6164d770da34d5af6486a0 /drivers/watchdog/cpwd.c | |
parent | d12d42f744f805a9ccc33cd76f04b237cd83ce56 (diff) |
of: Always use 'struct device.of_node' to get device node pointer.
The following structure elements duplicate the information in
'struct device.of_node' and so are being eliminated. This patch
makes all readers of these elements use device.of_node instead.
(struct of_device *)->node
(struct dev_archdata *)->prom_node (sparc)
(struct dev_archdata *)->of_node (powerpc & microblaze)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/watchdog/cpwd.c')
-rw-r--r-- | drivers/watchdog/cpwd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c index ba2efce4b40e..2fcc3cf7ef62 100644 --- a/drivers/watchdog/cpwd.c +++ b/drivers/watchdog/cpwd.c | |||
@@ -577,7 +577,7 @@ static int __devinit cpwd_probe(struct of_device *op, | |||
577 | * interrupt_mask register cannot be written, so no timer | 577 | * interrupt_mask register cannot be written, so no timer |
578 | * interrupts can be masked within the PLD. | 578 | * interrupts can be masked within the PLD. |
579 | */ | 579 | */ |
580 | str_prop = of_get_property(op->node, "model", NULL); | 580 | str_prop = of_get_property(op->dev.of_node, "model", NULL); |
581 | p->broken = (str_prop && !strcmp(str_prop, WD_BADMODEL)); | 581 | p->broken = (str_prop && !strcmp(str_prop, WD_BADMODEL)); |
582 | 582 | ||
583 | if (!p->enabled) | 583 | if (!p->enabled) |