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 20/37] drivers/input: 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/input/serio/i8042-sparcio.h | 2 +-
    drivers/input/serio/xilinx_ps2.c | 8 ++++----
    2 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
    index 5071af2..29e1769 100644
    --- a/drivers/input/serio/i8042-sparcio.h
    +++ b/drivers/input/serio/i8042-sparcio.h
    @@ -51,7 +51,7 @@ static inline void i8042_write_command(int val)

    static int __devinit sparc_i8042_probe(struct of_device *op, const struct of_device_id *match)
    {
    - struct device_node *dp = op->node;
    + struct device_node *dp = op->dev.of_node;

    dp = dp->child;
    while (dp) {
    diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
    index 8298e1f..f154153 100644
    --- a/drivers/input/serio/xilinx_ps2.c
    +++ b/drivers/input/serio/xilinx_ps2.c
    @@ -243,17 +243,17 @@ static int __devinit xps2_of_probe(struct of_device *ofdev,
    int error;

    dev_info(dev, "Device Tree Probing \'%s\'\n",
    - ofdev->node->name);
    + ofdev->dev.of_node->name);

    /* Get iospace for the device */
    - error = of_address_to_resource(ofdev->node, 0, &r_mem);
    + error = of_address_to_resource(ofdev->dev.of_node, 0, &r_mem);
    if (error) {
    dev_err(dev, "invalid address\n");
    return error;
    }

    /* Get IRQ for the device */
    - if (of_irq_to_resource(ofdev->node, 0, &r_irq) == NO_IRQ) {
    + if (of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq) == NO_IRQ) {
    dev_err(dev, "no IRQ found\n");
    return -ENODEV;
    }
    @@ -341,7 +341,7 @@ static int __devexit xps2_of_remove(struct of_device *of_dev)
    iounmap(drvdata->base_address);

    /* Get iospace of the device */
    - if (of_address_to_resource(of_dev->node, 0, &r_mem))
    + if (of_address_to_resource(of_dev->dev.of_node, 0, &r_mem))
    dev_err(dev, "invalid address\n");
    else
    release_mem_region(r_mem.start, resource_size(&r_mem));


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