Skip to content

Commit a2bdce5

Browse files
committed
[driver] fix function type and return value for clk.c and clk.h
Fix useless return value of functions and declarations.Those functions always return RT_EOK, but caller check their error code either. Signed-off-by: 1078249029 <[email protected]>
1 parent 6481633 commit a2bdce5

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

components/drivers/clk/clk.c

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -454,9 +454,14 @@ static void clk_unprepare(struct rt_clk *clk, struct rt_clk_node *clk_np)
454454
}
455455
}
456456

457-
rt_err_t rt_clk_unprepare(struct rt_clk *clk)
457+
/**
458+
* @brief Unprepare clock
459+
*
460+
* @param clk point to clock
461+
*
462+
*/
463+
void rt_clk_unprepare(struct rt_clk *clk)
458464
{
459-
rt_err_t err = RT_EOK;
460465

461466
RT_DEBUG_NOT_IN_INTERRUPT;
462467

@@ -469,7 +474,6 @@ rt_err_t rt_clk_unprepare(struct rt_clk *clk)
469474
rt_hw_spin_unlock(&_clk_lock.lock);
470475
}
471476

472-
return err;
473477
}
474478

475479
/**
@@ -647,25 +651,23 @@ rt_err_t rt_clk_array_prepare(struct rt_clk_array *clk_arr)
647651
return err;
648652
}
649653

650-
rt_err_t rt_clk_array_unprepare(struct rt_clk_array *clk_arr)
654+
/**
655+
* @brief Unprepare clock array for mutipule out clock
656+
*
657+
* @param clk_arr point to clock array
658+
*
659+
*/
660+
void rt_clk_array_unprepare(struct rt_clk_array *clk_arr)
651661
{
652-
rt_err_t err = RT_EOK;
653662

654663
if (clk_arr)
655664
{
656665
for (int i = 0; i < clk_arr->count; ++i)
657666
{
658-
if ((err = rt_clk_unprepare(clk_arr->clks[i])))
659-
{
660-
LOG_E("CLK Array[%d] %s failed error = %s", i,
661-
"unprepare", rt_strerror(err));
662-
663-
break;
664-
}
667+
rt_clk_unprepare(clk_arr->clks[i]);
665668
}
666669
}
667670

668-
return err;
669671
}
670672

671673
/**

components/drivers/include/drivers/clk.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ rt_err_t rt_clk_notifier_unregister(struct rt_clk *clk, struct rt_clk_notifier *
160160
rt_err_t rt_clk_set_parent(struct rt_clk *clk, struct rt_clk *clk_parent);
161161

162162
rt_err_t rt_clk_prepare(struct rt_clk *clk);
163-
rt_err_t rt_clk_unprepare(struct rt_clk *clk);
163+
void rt_clk_unprepare(struct rt_clk *clk);
164164

165165
rt_err_t rt_clk_enable(struct rt_clk *clk);
166166
void rt_clk_disable(struct rt_clk *clk);
@@ -169,7 +169,7 @@ rt_err_t rt_clk_prepare_enable(struct rt_clk *clk);
169169
void rt_clk_disable_unprepare(struct rt_clk *clk);
170170

171171
rt_err_t rt_clk_array_prepare(struct rt_clk_array *clk_arr);
172-
rt_err_t rt_clk_array_unprepare(struct rt_clk_array *clk_arr);
172+
void rt_clk_array_unprepare(struct rt_clk_array *clk_arr);
173173

174174
rt_err_t rt_clk_array_enable(struct rt_clk_array *clk_arr);
175175
void rt_clk_array_disable(struct rt_clk_array *clk_arr);

0 commit comments

Comments
 (0)