lkml.org 
[lkml]   [2010]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/37] drivers/atm: use .dev.of_node instead of .node in struct of_device
    Date
    .node is being removed

    Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
    ---

    drivers/atm/fore200e.c | 16 +++++++++-------
    1 files changed, 9 insertions(+), 7 deletions(-)

    diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
    index f7d6eba..593a03a 100644
    --- a/drivers/atm/fore200e.c
    +++ b/drivers/atm/fore200e.c
    @@ -789,7 +789,7 @@ static int __init fore200e_sba_map(struct fore200e *fore200e)
    fore200e->bus->write(0x02, fore200e->regs.sba.isr); /* XXX hardwired interrupt level */

    /* get the supported DVMA burst sizes */
    - bursts = of_getintprop_default(op->node->parent, "burst-sizes", 0x00);
    + bursts = of_getintprop_default(op->dev.of_node->parent, "burst-sizes", 0x00);

    if (sbus_can_dma_64bit())
    sbus_set_sbus64(&op->dev, bursts);
    @@ -820,18 +820,20 @@ static int __init fore200e_sba_prom_read(struct fore200e *fore200e, struct prom_
    const u8 *prop;
    int len;

    - prop = of_get_property(op->node, "madaddrlo2", &len);
    + prop = of_get_property(op->dev.of_node, "madaddrlo2", &len);
    if (!prop)
    return -ENODEV;
    memcpy(&prom->mac_addr[4], prop, 4);

    - prop = of_get_property(op->node, "madaddrhi4", &len);
    + prop = of_get_property(op->dev.of_node, "madaddrhi4", &len);
    if (!prop)
    return -ENODEV;
    memcpy(&prom->mac_addr[2], prop, 4);

    - prom->serial_number = of_getintprop_default(op->node, "serialnumber", 0);
    - prom->hw_revision = of_getintprop_default(op->node, "promversion", 0);
    + prom->serial_number = of_getintprop_default(op->dev.of_node,
    + "serialnumber", 0);
    + prom->hw_revision = of_getintprop_default(op->dev.of_node,
    + "promversion", 0);

    return 0;
    }
    @@ -841,10 +843,10 @@ static int fore200e_sba_proc_read(struct fore200e *fore200e, char *page)
    struct of_device *op = fore200e->bus_dev;
    const struct linux_prom_registers *regs;

    - regs = of_get_property(op->node, "reg", NULL);
    + regs = of_get_property(op->dev.of_node, "reg", NULL);

    return sprintf(page, " SBUS slot/device:\t\t%d/'%s'\n",
    - (regs ? regs->which_io : 0), op->node->name);
    + (regs ? regs->which_io : 0), op->dev.of_node->name);
    }
    #endif /* CONFIG_SBUS */



    \
     
     \ /
      Last update: 2010-03-11 19:07    [W:0.021 / U:2.868 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site