Skip to content

Commit aac00c7

Browse files
mripardbebarino
mripard
authored and
bebarino
committed
clk: test: Switch to clk_hw_get_clk
Following the clk_hw->clk pointer is equivalent to calling clk_hw_get_clk(), but will make the job harder if we need to rework that part in the future. Signed-off-by: Maxime Ripard <maxime@cerno.tech> Link: https://lore.kernel.org/r/20220816112530.1837489-2-maxime@cerno.tech Tested-by: Linux Kernel Functional Testing <lkft@linaro.org> Tested-by: Naresh Kamboju <naresh.kamboju@linaro.org> Signed-off-by: Stephen Boyd <sboyd@kernel.org>
1 parent 568035b commit aac00c7

File tree

1 file changed

+55
-19
lines changed

1 file changed

+55
-19
lines changed

‎drivers/clk/clk_test.c‎

Lines changed: 55 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,14 @@ static void clk_test_get_rate(struct kunit *test)
160160
{
161161
struct clk_dummy_context *ctx = test->priv;
162162
struct clk_hw *hw = &ctx->hw;
163-
struct clk *clk = hw->clk;
163+
struct clk *clk = clk_hw_get_clk(hw, NULL);
164164
unsigned long rate;
165165

166166
rate = clk_get_rate(clk);
167167
KUNIT_ASSERT_GT(test, rate, 0);
168168
KUNIT_EXPECT_EQ(test, rate, ctx->rate);
169+
170+
clk_put(clk);
169171
}
170172

171173
/*
@@ -179,7 +181,7 @@ static void clk_test_set_get_rate(struct kunit *test)
179181
{
180182
struct clk_dummy_context *ctx = test->priv;
181183
struct clk_hw *hw = &ctx->hw;
182-
struct clk *clk = hw->clk;
184+
struct clk *clk = clk_hw_get_clk(hw, NULL);
183185
unsigned long rate;
184186

185187
KUNIT_ASSERT_EQ(test,
@@ -189,6 +191,8 @@ static void clk_test_set_get_rate(struct kunit *test)
189191
rate = clk_get_rate(clk);
190192
KUNIT_ASSERT_GT(test, rate, 0);
191193
KUNIT_EXPECT_EQ(test, rate, DUMMY_CLOCK_RATE_1);
194+
195+
clk_put(clk);
192196
}
193197

194198
/*
@@ -202,7 +206,7 @@ static void clk_test_set_set_get_rate(struct kunit *test)
202206
{
203207
struct clk_dummy_context *ctx = test->priv;
204208
struct clk_hw *hw = &ctx->hw;
205-
struct clk *clk = hw->clk;
209+
struct clk *clk = clk_hw_get_clk(hw, NULL);
206210
unsigned long rate;
207211

208212
KUNIT_ASSERT_EQ(test,
@@ -216,6 +220,8 @@ static void clk_test_set_set_get_rate(struct kunit *test)
216220
rate = clk_get_rate(clk);
217221
KUNIT_ASSERT_GT(test, rate, 0);
218222
KUNIT_EXPECT_EQ(test, rate, DUMMY_CLOCK_RATE_2);
223+
224+
clk_put(clk);
219225
}
220226

221227
/*
@@ -226,7 +232,7 @@ static void clk_test_round_set_get_rate(struct kunit *test)
226232
{
227233
struct clk_dummy_context *ctx = test->priv;
228234
struct clk_hw *hw = &ctx->hw;
229-
struct clk *clk = hw->clk;
235+
struct clk *clk = clk_hw_get_clk(hw, NULL);
230236
unsigned long rounded_rate, set_rate;
231237

232238
rounded_rate = clk_round_rate(clk, DUMMY_CLOCK_RATE_1);
@@ -240,6 +246,8 @@ static void clk_test_round_set_get_rate(struct kunit *test)
240246
set_rate = clk_get_rate(clk);
241247
KUNIT_ASSERT_GT(test, set_rate, 0);
242248
KUNIT_EXPECT_EQ(test, rounded_rate, set_rate);
249+
250+
clk_put(clk);
243251
}
244252

245253
static struct kunit_case clk_test_cases[] = {
@@ -314,7 +322,7 @@ static void clk_test_orphan_transparent_parent_mux_set_range(struct kunit *test)
314322
{
315323
struct clk_single_parent_ctx *ctx = test->priv;
316324
struct clk_hw *hw = &ctx->hw;
317-
struct clk *clk = hw->clk;
325+
struct clk *clk = clk_hw_get_clk(hw, NULL);
318326
unsigned long rate, new_rate;
319327

320328
rate = clk_get_rate(clk);
@@ -329,6 +337,8 @@ static void clk_test_orphan_transparent_parent_mux_set_range(struct kunit *test)
329337
new_rate = clk_get_rate(clk);
330338
KUNIT_ASSERT_GT(test, new_rate, 0);
331339
KUNIT_EXPECT_EQ(test, rate, new_rate);
340+
341+
clk_put(clk);
332342
}
333343

334344
static struct kunit_case clk_orphan_transparent_single_parent_mux_test_cases[] = {
@@ -352,7 +362,7 @@ static void clk_range_test_set_range(struct kunit *test)
352362
{
353363
struct clk_dummy_context *ctx = test->priv;
354364
struct clk_hw *hw = &ctx->hw;
355-
struct clk *clk = hw->clk;
365+
struct clk *clk = clk_hw_get_clk(hw, NULL);
356366
unsigned long rate;
357367

358368
KUNIT_ASSERT_EQ(test,
@@ -365,6 +375,8 @@ static void clk_range_test_set_range(struct kunit *test)
365375
KUNIT_ASSERT_GT(test, rate, 0);
366376
KUNIT_EXPECT_GE(test, rate, DUMMY_CLOCK_RATE_1);
367377
KUNIT_EXPECT_LE(test, rate, DUMMY_CLOCK_RATE_2);
378+
379+
clk_put(clk);
368380
}
369381

370382
/*
@@ -375,13 +387,15 @@ static void clk_range_test_set_range_invalid(struct kunit *test)
375387
{
376388
struct clk_dummy_context *ctx = test->priv;
377389
struct clk_hw *hw = &ctx->hw;
378-
struct clk *clk = hw->clk;
390+
struct clk *clk = clk_hw_get_clk(hw, NULL);
379391

380392
KUNIT_EXPECT_LT(test,
381393
clk_set_rate_range(clk,
382394
DUMMY_CLOCK_RATE_1 + 1000,
383395
DUMMY_CLOCK_RATE_1),
384396
0);
397+
398+
clk_put(clk);
385399
}
386400

387401
/*
@@ -420,7 +434,7 @@ static void clk_range_test_set_range_round_rate_lower(struct kunit *test)
420434
{
421435
struct clk_dummy_context *ctx = test->priv;
422436
struct clk_hw *hw = &ctx->hw;
423-
struct clk *clk = hw->clk;
437+
struct clk *clk = clk_hw_get_clk(hw, NULL);
424438
long rate;
425439

426440
KUNIT_ASSERT_EQ(test,
@@ -433,6 +447,8 @@ static void clk_range_test_set_range_round_rate_lower(struct kunit *test)
433447
KUNIT_ASSERT_GT(test, rate, 0);
434448
KUNIT_EXPECT_GE(test, rate, DUMMY_CLOCK_RATE_1);
435449
KUNIT_EXPECT_LE(test, rate, DUMMY_CLOCK_RATE_2);
450+
451+
clk_put(clk);
436452
}
437453

438454
/*
@@ -443,7 +459,7 @@ static void clk_range_test_set_range_set_rate_lower(struct kunit *test)
443459
{
444460
struct clk_dummy_context *ctx = test->priv;
445461
struct clk_hw *hw = &ctx->hw;
446-
struct clk *clk = hw->clk;
462+
struct clk *clk = clk_hw_get_clk(hw, NULL);
447463
unsigned long rate;
448464

449465
KUNIT_ASSERT_EQ(test,
@@ -460,6 +476,8 @@ static void clk_range_test_set_range_set_rate_lower(struct kunit *test)
460476
KUNIT_ASSERT_GT(test, rate, 0);
461477
KUNIT_EXPECT_GE(test, rate, DUMMY_CLOCK_RATE_1);
462478
KUNIT_EXPECT_LE(test, rate, DUMMY_CLOCK_RATE_2);
479+
480+
clk_put(clk);
463481
}
464482

465483
/*
@@ -472,7 +490,7 @@ static void clk_range_test_set_range_set_round_rate_consistent_lower(struct kuni
472490
{
473491
struct clk_dummy_context *ctx = test->priv;
474492
struct clk_hw *hw = &ctx->hw;
475-
struct clk *clk = hw->clk;
493+
struct clk *clk = clk_hw_get_clk(hw, NULL);
476494
long rounded;
477495

478496
KUNIT_ASSERT_EQ(test,
@@ -489,6 +507,8 @@ static void clk_range_test_set_range_set_round_rate_consistent_lower(struct kuni
489507
0);
490508

491509
KUNIT_EXPECT_EQ(test, rounded, clk_get_rate(clk));
510+
511+
clk_put(clk);
492512
}
493513

494514
/*
@@ -499,7 +519,7 @@ static void clk_range_test_set_range_round_rate_higher(struct kunit *test)
499519
{
500520
struct clk_dummy_context *ctx = test->priv;
501521
struct clk_hw *hw = &ctx->hw;
502-
struct clk *clk = hw->clk;
522+
struct clk *clk = clk_hw_get_clk(hw, NULL);
503523
long rate;
504524

505525
KUNIT_ASSERT_EQ(test,
@@ -512,6 +532,8 @@ static void clk_range_test_set_range_round_rate_higher(struct kunit *test)
512532
KUNIT_ASSERT_GT(test, rate, 0);
513533
KUNIT_EXPECT_GE(test, rate, DUMMY_CLOCK_RATE_1);
514534
KUNIT_EXPECT_LE(test, rate, DUMMY_CLOCK_RATE_2);
535+
536+
clk_put(clk);
515537
}
516538

517539
/*
@@ -522,7 +544,7 @@ static void clk_range_test_set_range_set_rate_higher(struct kunit *test)
522544
{
523545
struct clk_dummy_context *ctx = test->priv;
524546
struct clk_hw *hw = &ctx->hw;
525-
struct clk *clk = hw->clk;
547+
struct clk *clk = clk_hw_get_clk(hw, NULL);
526548
unsigned long rate;
527549

528550
KUNIT_ASSERT_EQ(test,
@@ -539,6 +561,8 @@ static void clk_range_test_set_range_set_rate_higher(struct kunit *test)
539561
KUNIT_ASSERT_GT(test, rate, 0);
540562
KUNIT_EXPECT_GE(test, rate, DUMMY_CLOCK_RATE_1);
541563
KUNIT_EXPECT_LE(test, rate, DUMMY_CLOCK_RATE_2);
564+
565+
clk_put(clk);
542566
}
543567

544568
/*
@@ -551,7 +575,7 @@ static void clk_range_test_set_range_set_round_rate_consistent_higher(struct kun
551575
{
552576
struct clk_dummy_context *ctx = test->priv;
553577
struct clk_hw *hw = &ctx->hw;
554-
struct clk *clk = hw->clk;
578+
struct clk *clk = clk_hw_get_clk(hw, NULL);
555579
long rounded;
556580

557581
KUNIT_ASSERT_EQ(test,
@@ -568,6 +592,8 @@ static void clk_range_test_set_range_set_round_rate_consistent_higher(struct kun
568592
0);
569593

570594
KUNIT_EXPECT_EQ(test, rounded, clk_get_rate(clk));
595+
596+
clk_put(clk);
571597
}
572598

573599
/*
@@ -582,7 +608,7 @@ static void clk_range_test_set_range_get_rate_raised(struct kunit *test)
582608
{
583609
struct clk_dummy_context *ctx = test->priv;
584610
struct clk_hw *hw = &ctx->hw;
585-
struct clk *clk = hw->clk;
611+
struct clk *clk = clk_hw_get_clk(hw, NULL);
586612
unsigned long rate;
587613

588614
KUNIT_ASSERT_EQ(test,
@@ -598,6 +624,8 @@ static void clk_range_test_set_range_get_rate_raised(struct kunit *test)
598624
rate = clk_get_rate(clk);
599625
KUNIT_ASSERT_GT(test, rate, 0);
600626
KUNIT_EXPECT_EQ(test, rate, DUMMY_CLOCK_RATE_1);
627+
628+
clk_put(clk);
601629
}
602630

603631
/*
@@ -612,7 +640,7 @@ static void clk_range_test_set_range_get_rate_lowered(struct kunit *test)
612640
{
613641
struct clk_dummy_context *ctx = test->priv;
614642
struct clk_hw *hw = &ctx->hw;
615-
struct clk *clk = hw->clk;
643+
struct clk *clk = clk_hw_get_clk(hw, NULL);
616644
unsigned long rate;
617645

618646
KUNIT_ASSERT_EQ(test,
@@ -628,6 +656,8 @@ static void clk_range_test_set_range_get_rate_lowered(struct kunit *test)
628656
rate = clk_get_rate(clk);
629657
KUNIT_ASSERT_GT(test, rate, 0);
630658
KUNIT_EXPECT_EQ(test, rate, DUMMY_CLOCK_RATE_2);
659+
660+
clk_put(clk);
631661
}
632662

633663
static struct kunit_case clk_range_test_cases[] = {
@@ -664,7 +694,7 @@ static void clk_range_test_set_range_rate_maximized(struct kunit *test)
664694
{
665695
struct clk_dummy_context *ctx = test->priv;
666696
struct clk_hw *hw = &ctx->hw;
667-
struct clk *clk = hw->clk;
697+
struct clk *clk = clk_hw_get_clk(hw, NULL);
668698
unsigned long rate;
669699

670700
KUNIT_ASSERT_EQ(test,
@@ -700,6 +730,8 @@ static void clk_range_test_set_range_rate_maximized(struct kunit *test)
700730
rate = clk_get_rate(clk);
701731
KUNIT_ASSERT_GT(test, rate, 0);
702732
KUNIT_EXPECT_EQ(test, rate, DUMMY_CLOCK_RATE_2);
733+
734+
clk_put(clk);
703735
}
704736

705737
/*
@@ -714,7 +746,7 @@ static void clk_range_test_multiple_set_range_rate_maximized(struct kunit *test)
714746
{
715747
struct clk_dummy_context *ctx = test->priv;
716748
struct clk_hw *hw = &ctx->hw;
717-
struct clk *clk = hw->clk;
749+
struct clk *clk = clk_hw_get_clk(hw, NULL);
718750
struct clk *user1, *user2;
719751
unsigned long rate;
720752

@@ -758,6 +790,7 @@ static void clk_range_test_multiple_set_range_rate_maximized(struct kunit *test)
758790

759791
clk_put(user2);
760792
clk_put(user1);
793+
clk_put(clk);
761794
}
762795

763796
static struct kunit_case clk_range_maximize_test_cases[] = {
@@ -785,7 +818,7 @@ static void clk_range_test_set_range_rate_minimized(struct kunit *test)
785818
{
786819
struct clk_dummy_context *ctx = test->priv;
787820
struct clk_hw *hw = &ctx->hw;
788-
struct clk *clk = hw->clk;
821+
struct clk *clk = clk_hw_get_clk(hw, NULL);
789822
unsigned long rate;
790823

791824
KUNIT_ASSERT_EQ(test,
@@ -821,6 +854,8 @@ static void clk_range_test_set_range_rate_minimized(struct kunit *test)
821854
rate = clk_get_rate(clk);
822855
KUNIT_ASSERT_GT(test, rate, 0);
823856
KUNIT_EXPECT_EQ(test, rate, DUMMY_CLOCK_RATE_1);
857+
858+
clk_put(clk);
824859
}
825860

826861
/*
@@ -835,7 +870,7 @@ static void clk_range_test_multiple_set_range_rate_minimized(struct kunit *test)
835870
{
836871
struct clk_dummy_context *ctx = test->priv;
837872
struct clk_hw *hw = &ctx->hw;
838-
struct clk *clk = hw->clk;
873+
struct clk *clk = clk_hw_get_clk(hw, NULL);
839874
struct clk *user1, *user2;
840875
unsigned long rate;
841876

@@ -875,6 +910,7 @@ static void clk_range_test_multiple_set_range_rate_minimized(struct kunit *test)
875910

876911
clk_put(user2);
877912
clk_put(user1);
913+
clk_put(clk);
878914
}
879915

880916
static struct kunit_case clk_range_minimize_test_cases[] = {

0 commit comments

Comments
 (0)