Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: renesas: rcar-gen3: Pass name/offset to cpg_sd_clk_register()

Explicitly pass the clock's name and register offset to
cpg_sd_clk_register(), so the latter doesn't have to extract them from
the cpg_core_clk object.

This keeps all cpg_core_clk parsing and unmarshalling contained in a
single function (rcar_gen3_cpg_clk_register()).

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>

+6 -6
+6 -6
drivers/clk/renesas/rcar-gen3-cpg.c
··· 369 369 #define RCKCR_CKSEL BIT(1) /* Manual RCLK parent selection */ 370 370 #define SD_SKIP_FIRST BIT(2) /* Skip first clock in SD table */ 371 371 372 - static struct clk * __init cpg_sd_clk_register(const struct cpg_core_clk *core, 373 - void __iomem *base, const char *parent_name, 372 + static struct clk * __init cpg_sd_clk_register(const char *name, 373 + void __iomem *base, unsigned int offset, const char *parent_name, 374 374 struct raw_notifier_head *notifiers) 375 375 { 376 376 struct clk_init_data init; ··· 383 383 if (!clock) 384 384 return ERR_PTR(-ENOMEM); 385 385 386 - init.name = core->name; 386 + init.name = name; 387 387 init.ops = &cpg_sd_clock_ops; 388 388 init.flags = CLK_SET_RATE_PARENT; 389 389 init.parent_names = &parent_name; 390 390 init.num_parents = 1; 391 391 392 - clock->csn.reg = base + core->offset; 392 + clock->csn.reg = base + offset; 393 393 clock->hw.init = &init; 394 394 clock->div_table = cpg_sd_div_table; 395 395 clock->div_num = ARRAY_SIZE(cpg_sd_div_table); ··· 606 606 break; 607 607 608 608 case CLK_TYPE_GEN3_SD: 609 - return cpg_sd_clk_register(core, base, __clk_get_name(parent), 610 - notifiers); 609 + return cpg_sd_clk_register(core->name, base, core->offset, 610 + __clk_get_name(parent), notifiers); 611 611 612 612 case CLK_TYPE_GEN3_R: 613 613 if (cpg_quirks & RCKCR_CKSEL) {