Seems fine... adding EHCA guys just to make sure.
> .node is being removed
>
> Signed-off-by: Grant Likely <grant.likely@xxxxxxxxxxxx>
> ---
>
> 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 129a6be..2639185 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)
> };
>
> ehca_gen_dbg("Probing adapter %s...",
> - shca->ofdev->node->full_name);
> - loc_code = of_get_property(shca->ofdev->node, "ibm,loc-code", NULL);
> + shca->ofdev->dev.of_node->full_name);
> + loc_code = of_get_property(shca->ofdev->dev.of_node, "ibm,loc-code",
> + NULL);
> if (loc_code)
> ehca_gen_dbg(" ... location lode=%s", loc_code);
>
> @@ -720,16 +721,16 @@ static int __devinit ehca_probe(struct of_device *dev,
> int ret, i, eq_size;
> unsigned long flags;
>
> - handle = of_get_property(dev->node, "ibm,hca-handle", NULL);
> + handle = of_get_property(dev->dev.of_node, "ibm,hca-handle", NULL);
> if (!handle) {
> ehca_gen_err("Cannot get eHCA handle for adapter: %s.",
> - dev->node->full_name);
> + dev->dev.of_node->full_name);
> return -ENODEV;
> }
>
> if (!(*handle)) {
> ehca_gen_err("Wrong eHCA handle for adapter: %s.",
> - dev->node->full_name);
> + dev->dev.of_node->full_name);
> return -ENODEV;
> }
>
>
> --
Roland Dreier <rolandd@xxxxxxxxx>
For corporate legal information go to:
http://www.cisco.com/web/about/doing_business/legal/cri/index.html
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
