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 06/37] arch/microblaze: 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>
    ---

    arch/microblaze/kernel/of_device.c | 8 ++++----
    arch/microblaze/kernel/of_platform.c | 4 ++--
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/microblaze/kernel/of_device.c b/arch/microblaze/kernel/of_device.c
    index 12371bd..ae165fc 100644
    --- a/arch/microblaze/kernel/of_device.c
    +++ b/arch/microblaze/kernel/of_device.c
    @@ -12,7 +12,7 @@
    void of_device_make_bus_id(struct of_device *dev)
    {
    static atomic_t bus_no_reg_magic;
    - struct device_node *node = dev->node;
    + struct device_node *node = dev->dev.of_node;
    const u32 *reg;
    u64 addr;
    int magic;
    @@ -76,17 +76,17 @@ int of_device_uevent(struct device *dev, struct kobj_uevent_env *env)

    ofdev = to_of_device(dev);

    - if (add_uevent_var(env, "OF_NAME=%s", ofdev->node->name))
    + if (add_uevent_var(env, "OF_NAME=%s", ofdev->dev.of_node->name))
    return -ENOMEM;

    - if (add_uevent_var(env, "OF_TYPE=%s", ofdev->node->type))
    + if (add_uevent_var(env, "OF_TYPE=%s", ofdev->dev.of_node->type))
    return -ENOMEM;

    /* Since the compatible field can contain pretty much anything
    * it's not really legal to split it out with commas. We split it
    * up using a number of environment variables instead. */

    - compat = of_get_property(ofdev->node, "compatible", &cplen);
    + compat = of_get_property(ofdev->dev.of_node, "compatible", &cplen);
    while (compat && *compat && cplen > 0) {
    if (add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat))
    return -ENOMEM;
    diff --git a/arch/microblaze/kernel/of_platform.c b/arch/microblaze/kernel/of_platform.c
    index 1c6d684..ea7d024 100644
    --- a/arch/microblaze/kernel/of_platform.c
    +++ b/arch/microblaze/kernel/of_platform.c
    @@ -167,7 +167,7 @@ EXPORT_SYMBOL(of_platform_bus_probe);

    static int of_dev_node_match(struct device *dev, void *data)
    {
    - return to_of_device(dev)->node == data;
    + return to_of_device(dev)->dev.of_node == data;
    }

    struct of_device *of_find_device_by_node(struct device_node *np)
    @@ -185,7 +185,7 @@ EXPORT_SYMBOL(of_find_device_by_node);
    static int of_dev_phandle_match(struct device *dev, void *data)
    {
    phandle *ph = data;
    - return to_of_device(dev)->node->phandle == *ph;
    + return to_of_device(dev)->dev.of_node->phandle == *ph;
    }

    struct of_device *of_find_device_by_phandle(phandle ph)


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