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/sunlance.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/net/sunlance.c')
-rw-r--r-- | drivers/net/sunlance.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 0c21653ff9f9..28afc86e0694 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
@@ -1324,7 +1324,7 @@ static int __devinit sparc_lance_probe_one(struct of_device *op, | |||
1324 | struct of_device *ledma, | 1324 | struct of_device *ledma, |
1325 | struct of_device *lebuffer) | 1325 | struct of_device *lebuffer) |
1326 | { | 1326 | { |
1327 | struct device_node *dp = op->node; | 1327 | struct device_node *dp = op->dev.of_node; |
1328 | static unsigned version_printed; | 1328 | static unsigned version_printed; |
1329 | struct lance_private *lp; | 1329 | struct lance_private *lp; |
1330 | struct net_device *dev; | 1330 | struct net_device *dev; |
@@ -1411,7 +1411,7 @@ static int __devinit sparc_lance_probe_one(struct of_device *op, | |||
1411 | 1411 | ||
1412 | lp->burst_sizes = 0; | 1412 | lp->burst_sizes = 0; |
1413 | if (lp->ledma) { | 1413 | if (lp->ledma) { |
1414 | struct device_node *ledma_dp = ledma->node; | 1414 | struct device_node *ledma_dp = ledma->dev.of_node; |
1415 | struct device_node *sbus_dp; | 1415 | struct device_node *sbus_dp; |
1416 | unsigned int sbmask; | 1416 | unsigned int sbmask; |
1417 | const char *prop; | 1417 | const char *prop; |
@@ -1507,7 +1507,7 @@ fail: | |||
1507 | static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match) | 1507 | static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match) |
1508 | { | 1508 | { |
1509 | struct of_device *parent = to_of_device(op->dev.parent); | 1509 | struct of_device *parent = to_of_device(op->dev.parent); |
1510 | struct device_node *parent_dp = parent->node; | 1510 | struct device_node *parent_dp = parent->dev.of_node; |
1511 | int err; | 1511 | int err; |
1512 | 1512 | ||
1513 | if (!strcmp(parent_dp->name, "ledma")) { | 1513 | if (!strcmp(parent_dp->name, "ledma")) { |