lkml.org 
[lkml]   [2015]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv3 2/2] clk: socfpga: make use of of_clk_parent_fill helper function
    Date
    From: Dinh Nguyen <dinguyen@opensource.altera.com>

    Use of_clk_parent_fill to fill in the parent clock's array.

    Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
    ---
    v3: none
    v2: none
    ---
    drivers/clk/socfpga/clk-gate.c | 6 +-----
    drivers/clk/socfpga/clk-pll.c | 7 +------
    2 files changed, 2 insertions(+), 11 deletions(-)

    diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
    index dd3a78c..fb5a5d7 100644
    --- a/drivers/clk/socfpga/clk-gate.c
    +++ b/drivers/clk/socfpga/clk-gate.c
    @@ -194,7 +194,6 @@ static void __init __socfpga_gate_init(struct device_node *node,
    const char *parent_name[SOCFPGA_MAX_PARENTS];
    struct clk_init_data init;
    int rc;
    - int i = 0;

    socfpga_clk = kzalloc(sizeof(*socfpga_clk), GFP_KERNEL);
    if (WARN_ON(!socfpga_clk))
    @@ -238,12 +237,9 @@ static void __init __socfpga_gate_init(struct device_node *node,
    init.name = clk_name;
    init.ops = ops;
    init.flags = 0;
    - while (i < SOCFPGA_MAX_PARENTS && (parent_name[i] =
    - of_clk_get_parent_name(node, i)) != NULL)
    - i++;

    + init.num_parents = of_clk_parent_fill(node, parent_name, SOCFPGA_MAX_PARENTS);
    init.parent_names = parent_name;
    - init.num_parents = i;
    socfpga_clk->hw.hw.init = &init;

    clk = clk_register(NULL, &socfpga_clk->hw.hw);
    diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
    index de6da95..8f26b52 100644
    --- a/drivers/clk/socfpga/clk-pll.c
    +++ b/drivers/clk/socfpga/clk-pll.c
    @@ -92,7 +92,6 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
    struct clk_init_data init;
    struct device_node *clkmgr_np;
    int rc;
    - int i = 0;

    of_property_read_u32(node, "reg", &reg);

    @@ -111,11 +110,7 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
    init.ops = ops;
    init.flags = 0;

    - while (i < SOCFPGA_MAX_PARENTS && (parent_name[i] =
    - of_clk_get_parent_name(node, i)) != NULL)
    - i++;
    -
    - init.num_parents = i;
    + init.num_parents = of_clk_parent_fill(node, parent_name, SOCFPGA_MAX_PARENTS);
    init.parent_names = parent_name;
    pll_clk->hw.hw.init = &init;

    --
    2.2.1


    \
     
     \ /
      Last update: 2015-06-05 18:41    [W:3.706 / U:0.248 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site