lkml.org 
[lkml]   [2014]   [May]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/4] of/platform: fix device naming for non-translatable addresses
    Date
    From: Rob Herring <robh@kernel.org>

    Using non-translatable addresses in platform device names is wrong
    because they may not be globally unique. Just use the default naming with
    a global index if the address cannot be translated instead.

    of_can_translate_address has the same checks as of_translate_address, so
    we can remove it here as well.

    Reported-by: "Ivan T. Ivanov" <iivanov@mm-sol.com>
    Cc: Josh Cartwright <joshc@codeaurora.org>
    Cc: Courtney Cavin <courtney.cavin@sonymobile.com>
    Cc: Bjorn Andersson <bjorn@kryo.se>
    Cc: Frank Rowand <frowand.list@gmail.com>
    Cc: Grant Likely <grant.likely@linaro.org>
    Signed-off-by: Rob Herring <robh@kernel.org>
    ---
    drivers/of/platform.c | 11 +----------
    1 file changed, 1 insertion(+), 10 deletions(-)

    diff --git a/drivers/of/platform.c b/drivers/of/platform.c
    index 622aeb3..d827ceb 100644
    --- a/drivers/of/platform.c
    +++ b/drivers/of/platform.c
    @@ -78,7 +78,6 @@ void of_device_make_bus_id(struct device *dev)
    struct device_node *node = dev->of_node;
    const __be32 *reg;
    u64 addr;
    - const __be32 *addrp;
    int magic;

    #ifdef CONFIG_PPC_DCR
    @@ -106,15 +105,7 @@ void of_device_make_bus_id(struct device *dev)
    */
    reg = of_get_property(node, "reg", NULL);
    if (reg) {
    - if (of_can_translate_address(node)) {
    - addr = of_translate_address(node, reg);
    - } else {
    - addrp = of_get_address(node, 0, NULL, NULL);
    - if (addrp)
    - addr = of_read_number(addrp, 1);
    - else
    - addr = OF_BAD_ADDR;
    - }
    + addr = of_translate_address(node, reg);
    if (addr != OF_BAD_ADDR) {
    dev_set_name(dev, "%llx.%s",
    (unsigned long long)addr, node->name);
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-05-08 00:21    [W:8.936 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site