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/infiniband | |
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/infiniband')
-rw-r--r-- | drivers/infiniband/hw/ehca/ehca_main.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c index 129a6bebd6e3..26391853277f 100644 --- a/drivers/infiniband/hw/ehca/ehca_main.c +++ b/drivers/infiniband/hw/ehca/ehca_main.c | |||
@@ -291,8 +291,9 @@ static int ehca_sense_attributes(struct ehca_shca *shca) | |||
291 | }; | 291 | }; |
292 | 292 | ||
293 | ehca_gen_dbg("Probing adapter %s...", | 293 | ehca_gen_dbg("Probing adapter %s...", |
294 | shca->ofdev->node->full_name); | 294 | shca->ofdev->dev.of_node->full_name); |
295 | loc_code = of_get_property(shca->ofdev->node, "ibm,loc-code", NULL); | 295 | loc_code = of_get_property(shca->ofdev->dev.of_node, "ibm,loc-code", |
296 | NULL); | ||
296 | if (loc_code) | 297 | if (loc_code) |
297 | ehca_gen_dbg(" ... location lode=%s", loc_code); | 298 | ehca_gen_dbg(" ... location lode=%s", loc_code); |
298 | 299 | ||
@@ -720,16 +721,16 @@ static int __devinit ehca_probe(struct of_device *dev, | |||
720 | int ret, i, eq_size; | 721 | int ret, i, eq_size; |
721 | unsigned long flags; | 722 | unsigned long flags; |
722 | 723 | ||
723 | handle = of_get_property(dev->node, "ibm,hca-handle", NULL); | 724 | handle = of_get_property(dev->dev.of_node, "ibm,hca-handle", NULL); |
724 | if (!handle) { | 725 | if (!handle) { |
725 | ehca_gen_err("Cannot get eHCA handle for adapter: %s.", | 726 | ehca_gen_err("Cannot get eHCA handle for adapter: %s.", |
726 | dev->node->full_name); | 727 | dev->dev.of_node->full_name); |
727 | return -ENODEV; | 728 | return -ENODEV; |
728 | } | 729 | } |
729 | 730 | ||
730 | if (!(*handle)) { | 731 | if (!(*handle)) { |
731 | ehca_gen_err("Wrong eHCA handle for adapter: %s.", | 732 | ehca_gen_err("Wrong eHCA handle for adapter: %s.", |
732 | dev->node->full_name); | 733 | dev->dev.of_node->full_name); |
733 | return -ENODEV; | 734 | return -ENODEV; |
734 | } | 735 | } |
735 | 736 | ||