@@ -3342,6 +3342,7 @@ static void clk_core_reparent_orphans_nolock(void)
3342
3342
static int __clk_core_init (struct clk_core * core )
3343
3343
{
3344
3344
int ret ;
3345
+ struct clk_core * parent ;
3345
3346
unsigned long rate ;
3346
3347
3347
3348
if (!core )
@@ -3413,7 +3414,7 @@ static int __clk_core_init(struct clk_core *core)
3413
3414
goto out ;
3414
3415
}
3415
3416
3416
- core -> parent = __clk_init_parent (core );
3417
+ parent = core -> parent = __clk_init_parent (core );
3417
3418
3418
3419
/*
3419
3420
* Populate core->parent if parent has already been clk_core_init'd. If
@@ -3425,10 +3426,9 @@ static int __clk_core_init(struct clk_core *core)
3425
3426
* clocks and re-parent any that are children of the clock currently
3426
3427
* being clk_init'd.
3427
3428
*/
3428
- if (core -> parent ) {
3429
- hlist_add_head (& core -> child_node ,
3430
- & core -> parent -> children );
3431
- core -> orphan = core -> parent -> orphan ;
3429
+ if (parent ) {
3430
+ hlist_add_head (& core -> child_node , & parent -> children );
3431
+ core -> orphan = parent -> orphan ;
3432
3432
} else if (!core -> num_parents ) {
3433
3433
hlist_add_head (& core -> child_node , & clk_root_list );
3434
3434
core -> orphan = false;
@@ -3446,9 +3446,9 @@ static int __clk_core_init(struct clk_core *core)
3446
3446
*/
3447
3447
if (core -> ops -> recalc_accuracy )
3448
3448
core -> accuracy = core -> ops -> recalc_accuracy (core -> hw ,
3449
- __clk_get_accuracy (core -> parent ));
3450
- else if (core -> parent )
3451
- core -> accuracy = core -> parent -> accuracy ;
3449
+ __clk_get_accuracy (parent ));
3450
+ else if (parent )
3451
+ core -> accuracy = parent -> accuracy ;
3452
3452
else
3453
3453
core -> accuracy = 0 ;
3454
3454
@@ -3472,9 +3472,9 @@ static int __clk_core_init(struct clk_core *core)
3472
3472
*/
3473
3473
if (core -> ops -> recalc_rate )
3474
3474
rate = core -> ops -> recalc_rate (core -> hw ,
3475
- clk_core_get_rate_nolock (core -> parent ));
3476
- else if (core -> parent )
3477
- rate = core -> parent -> rate ;
3475
+ clk_core_get_rate_nolock (parent ));
3476
+ else if (parent )
3477
+ rate = parent -> rate ;
3478
3478
else
3479
3479
rate = 0 ;
3480
3480
core -> rate = core -> req_rate = rate ;
0 commit comments