You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ma...@apache.org on 2022/08/30 23:51:05 UTC
[incubator-nuttx] 02/02: sched: Remove the unnecessary "FAR dq_queue_t *" cast
This is an automated email from the ASF dual-hosted git repository.
masayuki pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 2a981cec95256b46703374732263ffebf8a5601f
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Aug 30 09:36:44 2022 +0800
sched: Remove the unnecessary "FAR dq_queue_t *" cast
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
sched/paging/pg_worker.c | 3 +--
sched/pthread/pthread_create.c | 2 +-
sched/sched/sched.h | 2 +-
sched/sched/sched_addreadytorun.c | 14 +++++++-------
sched/sched/sched_lock.c | 4 ++--
sched/sched/sched_mergepending.c | 16 +++++++---------
sched/sched/sched_removereadytorun.c | 4 ++--
sched/task/task_init.c | 2 +-
sched/task/task_restart.c | 2 +-
sched/task/task_setup.c | 2 +-
sched/task/task_vfork.c | 2 +-
11 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/sched/paging/pg_worker.c b/sched/paging/pg_worker.c
index d2cb7ce439..a42cbfb3a3 100644
--- a/sched/paging/pg_worker.c
+++ b/sched/paging/pg_worker.c
@@ -223,8 +223,7 @@ static inline bool pg_dequeue(void)
{
/* Remove the TCB from the head of the list (if any) */
- g_pftcb = (FAR struct tcb_s *)
- dq_remfirst((FAR dq_queue_t *)&g_waitingforfill);
+ g_pftcb = (FAR struct tcb_s *)dq_remfirst(&g_waitingforfill);
pginfo("g_pftcb: %p\n", g_pftcb);
if (g_pftcb != NULL)
{
diff --git a/sched/pthread/pthread_create.c b/sched/pthread/pthread_create.c
index 9ba789b575..af9aec3dc1 100644
--- a/sched/pthread/pthread_create.c
+++ b/sched/pthread/pthread_create.c
@@ -575,7 +575,7 @@ int nx_pthread_create(pthread_trampoline_t trampoline, FAR pthread_t *thread,
else
{
sched_unlock();
- dq_rem((FAR dq_entry_t *)ptcb, (FAR dq_queue_t *)&g_inactivetasks);
+ dq_rem((FAR dq_entry_t *)ptcb, &g_inactivetasks);
nxsem_destroy(&pjoin->exit_sem);
errcode = EIO;
diff --git a/sched/sched/sched.h b/sched/sched/sched.h
index 6110976dc1..c8225fe4ae 100644
--- a/sched/sched/sched.h
+++ b/sched/sched/sched.h
@@ -74,7 +74,7 @@
#define TLIST_ISINDEXED(s) ((__TLIST_ATTR(s) & TLIST_ATTR_INDEXED) != 0)
#define TLIST_ISRUNNABLE(s) ((__TLIST_ATTR(s) & TLIST_ATTR_RUNNABLE) != 0)
-#define __TLIST_HEAD(s) (FAR dq_queue_t *)g_tasklisttable[s].list
+#define __TLIST_HEAD(s) g_tasklisttable[s].list
#define __TLIST_HEADINDEXED(s,c) (&(__TLIST_HEAD(s))[c])
#ifdef CONFIG_SMP
diff --git a/sched/sched/sched_addreadytorun.c b/sched/sched/sched_addreadytorun.c
index 8bd5705c13..7f81868c84 100644
--- a/sched/sched/sched_addreadytorun.c
+++ b/sched/sched/sched_addreadytorun.c
@@ -81,14 +81,14 @@ bool nxsched_add_readytorun(FAR struct tcb_s *btcb)
* g_pendingtasks task list for now.
*/
- nxsched_add_prioritized(btcb, (FAR dq_queue_t *)&g_pendingtasks);
+ nxsched_add_prioritized(btcb, &g_pendingtasks);
btcb->task_state = TSTATE_TASK_PENDING;
ret = false;
}
/* Otherwise, add the new task to the ready-to-run task list */
- else if (nxsched_add_prioritized(btcb, (FAR dq_queue_t *)&g_readytorun))
+ else if (nxsched_add_prioritized(btcb, &g_readytorun))
{
/* The new btcb was added at the head of the ready-to-run list. It
* is now the new active task!
@@ -229,7 +229,7 @@ bool nxsched_add_readytorun(FAR struct tcb_s *btcb)
* now.
*/
- nxsched_add_prioritized(btcb, (FAR dq_queue_t *)&g_pendingtasks);
+ nxsched_add_prioritized(btcb, &g_pendingtasks);
btcb->task_state = TSTATE_TASK_PENDING;
doswitch = false;
}
@@ -243,7 +243,7 @@ bool nxsched_add_readytorun(FAR struct tcb_s *btcb)
* Add the task to the ready-to-run (but not running) task list
*/
- nxsched_add_prioritized(btcb, (FAR dq_queue_t *)&g_readytorun);
+ nxsched_add_prioritized(btcb, &g_readytorun);
btcb->task_state = TSTATE_TASK_READYTORUN;
doswitch = false;
@@ -263,7 +263,7 @@ bool nxsched_add_readytorun(FAR struct tcb_s *btcb)
* and check if a context switch will occur
*/
- tasklist = (FAR dq_queue_t *)&g_assignedtasks[cpu];
+ tasklist = &g_assignedtasks[cpu];
switched = nxsched_add_prioritized(btcb, tasklist);
/* If the selected task list was the g_assignedtasks[] list and if the
@@ -337,12 +337,12 @@ bool nxsched_add_readytorun(FAR struct tcb_s *btcb)
if (nxsched_islocked_global())
{
next->task_state = TSTATE_TASK_PENDING;
- tasklist = (FAR dq_queue_t *)&g_pendingtasks;
+ tasklist = &g_pendingtasks;
}
else
{
next->task_state = TSTATE_TASK_READYTORUN;
- tasklist = (FAR dq_queue_t *)&g_readytorun;
+ tasklist = &g_readytorun;
}
nxsched_add_prioritized(next, tasklist);
diff --git a/sched/sched/sched_lock.c b/sched/sched/sched_lock.c
index ed1d07b56d..d07e751b99 100644
--- a/sched/sched/sched_lock.c
+++ b/sched/sched/sched_lock.c
@@ -211,8 +211,8 @@ int sched_lock(void)
* unlocked and nxsched_merge_pending() is called.
*/
- nxsched_merge_prioritized((FAR dq_queue_t *)&g_readytorun,
- (FAR dq_queue_t *)&g_pendingtasks,
+ nxsched_merge_prioritized(&g_readytorun,
+ &g_pendingtasks,
TSTATE_TASK_PENDING);
leave_critical_section(flags);
diff --git a/sched/sched/sched_mergepending.c b/sched/sched/sched_mergepending.c
index 05eaa660b1..15bcdc810b 100644
--- a/sched/sched/sched_mergepending.c
+++ b/sched/sched/sched_mergepending.c
@@ -195,7 +195,7 @@ bool nxsched_merge_pending(void)
{
/* Find the CPU that is executing the lowest priority task */
- ptcb = (FAR struct tcb_s *)dq_peek((FAR dq_queue_t *)&g_pendingtasks);
+ ptcb = (FAR struct tcb_s *)dq_peek(&g_pendingtasks);
if (ptcb == NULL)
{
/* The pending task list is empty */
@@ -219,8 +219,7 @@ bool nxsched_merge_pending(void)
{
/* Remove the task from the pending task list */
- tcb = (FAR struct tcb_s *)
- dq_remfirst((FAR dq_queue_t *)&g_pendingtasks);
+ tcb = (FAR struct tcb_s *)dq_remfirst(&g_pendingtasks);
/* Add the pending task to the correct ready-to-run list. */
@@ -237,8 +236,8 @@ bool nxsched_merge_pending(void)
* move them back to the pending task list.
*/
- nxsched_merge_prioritized((FAR dq_queue_t *)&g_readytorun,
- (FAR dq_queue_t *)&g_pendingtasks,
+ nxsched_merge_prioritized(&g_readytorun,
+ &g_pendingtasks,
TSTATE_TASK_PENDING);
/* And return with the scheduler locked and tasks in the
@@ -250,8 +249,7 @@ bool nxsched_merge_pending(void)
/* Set up for the next time through the loop */
- ptcb = (FAR struct tcb_s *)
- dq_peek((FAR dq_queue_t *)&g_pendingtasks);
+ ptcb = (FAR struct tcb_s *)dq_peek(&g_pendingtasks);
if (ptcb == NULL)
{
/* The pending task list is empty */
@@ -267,8 +265,8 @@ bool nxsched_merge_pending(void)
* tasks in the pending task list to the ready-to-run task list.
*/
- nxsched_merge_prioritized((FAR dq_queue_t *)&g_pendingtasks,
- (FAR dq_queue_t *)&g_readytorun,
+ nxsched_merge_prioritized(&g_pendingtasks,
+ &g_readytorun,
TSTATE_TASK_READYTORUN);
}
diff --git a/sched/sched/sched_removereadytorun.c b/sched/sched/sched_removereadytorun.c
index 398a348ce9..a8d08a510e 100644
--- a/sched/sched/sched_removereadytorun.c
+++ b/sched/sched/sched_removereadytorun.c
@@ -86,7 +86,7 @@ bool nxsched_remove_readytorun(FAR struct tcb_s *rtcb)
* is always the g_readytorun list.
*/
- dq_rem((FAR dq_entry_t *)rtcb, (FAR dq_queue_t *)&g_readytorun);
+ dq_rem((FAR dq_entry_t *)rtcb, &g_readytorun);
/* Since the TCB is not in any list, it is now invalid */
@@ -214,7 +214,7 @@ bool nxsched_remove_readytorun(FAR struct tcb_s *rtcb)
* list and add to the head of the g_assignedtasks[cpu] list.
*/
- dq_rem((FAR dq_entry_t *)rtrtcb, (FAR dq_queue_t *)&g_readytorun);
+ dq_rem((FAR dq_entry_t *)rtrtcb, &g_readytorun);
dq_addfirst((FAR dq_entry_t *)rtrtcb, tasklist);
rtrtcb->cpu = cpu;
diff --git a/sched/task/task_init.c b/sched/task/task_init.c
index dc9b43f102..48000efc94 100644
--- a/sched/task/task_init.c
+++ b/sched/task/task_init.c
@@ -218,7 +218,7 @@ void nxtask_uninit(FAR struct task_tcb_s *tcb)
* nxtask_setup_scheduler().
*/
- dq_rem((FAR dq_entry_t *)tcb, (FAR dq_queue_t *)&g_inactivetasks);
+ dq_rem((FAR dq_entry_t *)tcb, &g_inactivetasks);
/* Release all resources associated with the TCB... Including the TCB
* itself.
diff --git a/sched/task/task_restart.c b/sched/task/task_restart.c
index 4047d786ff..50a9d11610 100644
--- a/sched/task/task_restart.c
+++ b/sched/task/task_restart.c
@@ -178,7 +178,7 @@ int nxtask_restart(pid_t pid)
/* Add the task to the inactive task list */
- dq_addfirst((FAR dq_entry_t *)tcb, (FAR dq_queue_t *)&g_inactivetasks);
+ dq_addfirst((FAR dq_entry_t *)tcb, &g_inactivetasks);
tcb->cmn.task_state = TSTATE_TASK_INACTIVE;
#ifdef CONFIG_SMP
diff --git a/sched/task/task_setup.c b/sched/task/task_setup.c
index ed2b8c24e7..3ef9fd6de0 100644
--- a/sched/task/task_setup.c
+++ b/sched/task/task_setup.c
@@ -454,7 +454,7 @@ static int nxthread_setup_scheduler(FAR struct tcb_s *tcb, int priority,
/* Add the task to the inactive task list */
sched_lock();
- dq_addfirst((FAR dq_entry_t *)tcb, (FAR dq_queue_t *)&g_inactivetasks);
+ dq_addfirst((FAR dq_entry_t *)tcb, &g_inactivetasks);
tcb->task_state = TSTATE_TASK_INACTIVE;
sched_unlock();
}
diff --git a/sched/task/task_vfork.c b/sched/task/task_vfork.c
index cf7b692079..fa96154a98 100644
--- a/sched/task/task_vfork.c
+++ b/sched/task/task_vfork.c
@@ -335,7 +335,7 @@ void nxtask_abort_vfork(FAR struct task_tcb_s *child, int errcode)
{
/* The TCB was added to the active task list by nxtask_setup_scheduler() */
- dq_rem((FAR dq_entry_t *)child, (FAR dq_queue_t *)&g_inactivetasks);
+ dq_rem((FAR dq_entry_t *)child, &g_inactivetasks);
/* Release the TCB */