lkml.org 
[lkml]   [2018]   [Dec]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 16/25] clocksource/drivers/integrator-ap: Add missing of_node_put()
    Date
    From: Yangtao Li <tiny.windzz@gmail.com>

    The function of_find_node_by_path() acquires a reference to the node
    returned by it and that reference needs to be dropped by its caller.

    integrator_ap_timer_init_of() doesn't do that. The pri_node and the
    sec_node are used as an identifier to compare against the current
    node, so we can directly drop the refcount after getting the node from
    the path as it is not used as pointer.

    By dropping the refcount right after getting it, a single variable is
    needed instead of two.

    Fix this by use a single variable and drop the refcount right after
    of_find_node_by_path().

    Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
    Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
    ---
    drivers/clocksource/timer-integrator-ap.c | 25 +++++++++++++++--------
    1 file changed, 16 insertions(+), 9 deletions(-)

    diff --git a/drivers/clocksource/timer-integrator-ap.c b/drivers/clocksource/timer-integrator-ap.c
    index 76e526f58620..19fb7de4b928 100644
    --- a/drivers/clocksource/timer-integrator-ap.c
    +++ b/drivers/clocksource/timer-integrator-ap.c
    @@ -181,8 +181,7 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
    int irq;
    struct clk *clk;
    unsigned long rate;
    - struct device_node *pri_node;
    - struct device_node *sec_node;
    + struct device_node *alias_node;

    base = of_io_request_and_map(node, 0, "integrator-timer");
    if (IS_ERR(base))
    @@ -204,7 +203,18 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
    return err;
    }

    - pri_node = of_find_node_by_path(path);
    + alias_node = of_find_node_by_path(path);
    +
    + /*
    + * The pointer is used as an identifier not as a pointer, we
    + * can drop the refcount on the of__node immediately after
    + * getting it.
    + */
    + of_node_put(alias_node);
    +
    + if (node == alias_node)
    + /* The primary timer lacks IRQ, use as clocksource */
    + return integrator_clocksource_init(rate, base);

    err = of_property_read_string(of_aliases,
    "arm,timer-secondary", &path);
    @@ -213,14 +223,11 @@ static int __init integrator_ap_timer_init_of(struct device_node *node)
    return err;
    }

    + alias_node = of_find_node_by_path(path);

    - sec_node = of_find_node_by_path(path);
    -
    - if (node == pri_node)
    - /* The primary timer lacks IRQ, use as clocksource */
    - return integrator_clocksource_init(rate, base);
    + of_node_put(alias_node);

    - if (node == sec_node) {
    + if (node == alias_node) {
    /* The secondary timer will drive the clock event */
    irq = irq_of_parse_and_map(node, 0);
    return integrator_clockevent_init(rate, base, irq);
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-12-18 22:30    [W:5.092 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site