mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
staging: vchiq_arm: Create keep-alive thread during probe
Creating the keep-alive thread in vchiq_platform_init_state have the following advantages: - abort driver probe if kthread_create fails (more consistent behavior) - make resource release process easier Since vchiq_keepalive_thread_func is defined below vchiq_platform_init_state, the latter must be moved. Signed-off-by: Stefan Wahren <wahrenst@gmx.net> Link: https://lore.kernel.org/r/20250309125014.37166-5-wahrenst@gmx.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
cfb320d990
commit
86bc882170
@@ -280,29 +280,6 @@ static int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
vchiq_platform_init_state(struct vchiq_state *state)
|
||||
{
|
||||
struct vchiq_arm_state *platform_state;
|
||||
|
||||
platform_state = devm_kzalloc(state->dev, sizeof(*platform_state), GFP_KERNEL);
|
||||
if (!platform_state)
|
||||
return -ENOMEM;
|
||||
|
||||
rwlock_init(&platform_state->susp_res_lock);
|
||||
|
||||
init_completion(&platform_state->ka_evt);
|
||||
atomic_set(&platform_state->ka_use_count, 0);
|
||||
atomic_set(&platform_state->ka_use_ack_count, 0);
|
||||
atomic_set(&platform_state->ka_release_count, 0);
|
||||
|
||||
platform_state->state = state;
|
||||
|
||||
state->platform_state = (struct opaque_platform_state *)platform_state;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct vchiq_arm_state *vchiq_platform_get_arm_state(struct vchiq_state *state)
|
||||
{
|
||||
return (struct vchiq_arm_state *)state->platform_state;
|
||||
@@ -1011,6 +988,39 @@ exit:
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
vchiq_platform_init_state(struct vchiq_state *state)
|
||||
{
|
||||
struct vchiq_arm_state *platform_state;
|
||||
char threadname[16];
|
||||
|
||||
platform_state = devm_kzalloc(state->dev, sizeof(*platform_state), GFP_KERNEL);
|
||||
if (!platform_state)
|
||||
return -ENOMEM;
|
||||
|
||||
snprintf(threadname, sizeof(threadname), "vchiq-keep/%d",
|
||||
state->id);
|
||||
platform_state->ka_thread = kthread_create(&vchiq_keepalive_thread_func,
|
||||
(void *)state, threadname);
|
||||
if (IS_ERR(platform_state->ka_thread)) {
|
||||
dev_err(state->dev, "couldn't create thread %s\n", threadname);
|
||||
return PTR_ERR(platform_state->ka_thread);
|
||||
}
|
||||
|
||||
rwlock_init(&platform_state->susp_res_lock);
|
||||
|
||||
init_completion(&platform_state->ka_evt);
|
||||
atomic_set(&platform_state->ka_use_count, 0);
|
||||
atomic_set(&platform_state->ka_use_ack_count, 0);
|
||||
atomic_set(&platform_state->ka_release_count, 0);
|
||||
|
||||
platform_state->state = state;
|
||||
|
||||
state->platform_state = (struct opaque_platform_state *)platform_state;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
|
||||
enum USE_TYPE_E use_type)
|
||||
@@ -1331,7 +1341,6 @@ void vchiq_platform_conn_state_changed(struct vchiq_state *state,
|
||||
enum vchiq_connstate newstate)
|
||||
{
|
||||
struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
|
||||
char threadname[16];
|
||||
|
||||
dev_dbg(state->dev, "suspend: %d: %s->%s\n",
|
||||
state->id, get_conn_state_name(oldstate), get_conn_state_name(newstate));
|
||||
@@ -1346,17 +1355,7 @@ void vchiq_platform_conn_state_changed(struct vchiq_state *state,
|
||||
|
||||
arm_state->first_connect = 1;
|
||||
write_unlock_bh(&arm_state->susp_res_lock);
|
||||
snprintf(threadname, sizeof(threadname), "vchiq-keep/%d",
|
||||
state->id);
|
||||
arm_state->ka_thread = kthread_create(&vchiq_keepalive_thread_func,
|
||||
(void *)state,
|
||||
threadname);
|
||||
if (IS_ERR(arm_state->ka_thread)) {
|
||||
dev_err(state->dev, "suspend: Couldn't create thread %s\n",
|
||||
threadname);
|
||||
} else {
|
||||
wake_up_process(arm_state->ka_thread);
|
||||
}
|
||||
wake_up_process(arm_state->ka_thread);
|
||||
}
|
||||
|
||||
static const struct of_device_id vchiq_of_match[] = {
|
||||
|
||||
Reference in New Issue
Block a user