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/net/can/sja1000 | |
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/net/can/sja1000')
-rw-r--r-- | drivers/net/can/sja1000/sja1000_of_platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c index 9dd076a626a5..dc5f20cdf93c 100644 --- a/drivers/net/can/sja1000/sja1000_of_platform.c +++ b/drivers/net/can/sja1000/sja1000_of_platform.c | |||
@@ -72,7 +72,7 @@ static int __devexit sja1000_ofp_remove(struct of_device *ofdev) | |||
72 | { | 72 | { |
73 | struct net_device *dev = dev_get_drvdata(&ofdev->dev); | 73 | struct net_device *dev = dev_get_drvdata(&ofdev->dev); |
74 | struct sja1000_priv *priv = netdev_priv(dev); | 74 | struct sja1000_priv *priv = netdev_priv(dev); |
75 | struct device_node *np = ofdev->node; | 75 | struct device_node *np = ofdev->dev.of_node; |
76 | struct resource res; | 76 | struct resource res; |
77 | 77 | ||
78 | dev_set_drvdata(&ofdev->dev, NULL); | 78 | dev_set_drvdata(&ofdev->dev, NULL); |
@@ -91,7 +91,7 @@ static int __devexit sja1000_ofp_remove(struct of_device *ofdev) | |||
91 | static int __devinit sja1000_ofp_probe(struct of_device *ofdev, | 91 | static int __devinit sja1000_ofp_probe(struct of_device *ofdev, |
92 | const struct of_device_id *id) | 92 | const struct of_device_id *id) |
93 | { | 93 | { |
94 | struct device_node *np = ofdev->node; | 94 | struct device_node *np = ofdev->dev.of_node; |
95 | struct net_device *dev; | 95 | struct net_device *dev; |
96 | struct sja1000_priv *priv; | 96 | struct sja1000_priv *priv; |
97 | struct resource res; | 97 | struct resource res; |