averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

staging: vchiq_arm: make vchiq_shutdown_internal return void

Browse Source 
The function vchiq_shutdown_internal always returns VCHIQ_SUCCESS. So change
the return type to void and simplify the logic in vchiq_shutdown.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1621105859-30215-17-git-send-email-stefan.wahren@i2se.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stefan Wahren
2021-05-19 17:56:32 +02:00
committed by Greg Kroah-Hartman
parent 1d702f5962
commit e39ff0e4ea
3 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+11 -14
View File
@@ -202,33 +202,30 @@ EXPORT_SYMBOL(vchiq_initialise);
enum vchiq_status vchiq_shutdown(struct vchiq_instance *instance)
{
enum vchiq_status status;
enum vchiq_status status = VCHIQ_SUCCESS;
struct vchiq_state *state = instance->state;
struct bulk_waiter_node *waiter, *next;
if (mutex_lock_killable(&state->mutex))
return VCHIQ_RETRY;
/* Remove all services */
status = vchiq_shutdown_internal(state, instance);
vchiq_shutdown_internal(state, instance);
mutex_unlock(&state->mutex);
vchiq_log_trace(vchiq_core_log_level,
"%s(%p): returning %d", __func__, instance, status);
if (status == VCHIQ_SUCCESS) {
struct bulk_waiter_node *waiter, *next;
list_for_each_entry_safe(waiter, next,
&instance->bulk_waiter_list, list) {
list_del(&waiter->list);
vchiq_log_info(vchiq_arm_log_level,
"bulk_waiter - cleaned up %pK for pid %d",
waiter, waiter->pid);
kfree(waiter);
}
kfree(instance);
list_for_each_entry_safe(waiter, next,
&instance->bulk_waiter_list, list) {
list_del(&waiter->list);
vchiq_log_info(vchiq_arm_log_level,
"bulk_waiter - cleaned up %pK for pid %d",
waiter, waiter->pid);
kfree(waiter);
}
kfree(instance);
return status;
}
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+1 -3
View File
@@ -2922,7 +2922,7 @@ vchiq_connect_internal(struct vchiq_state *state, struct vchiq_instance *instanc
return VCHIQ_SUCCESS;
}
enum vchiq_status
void
vchiq_shutdown_internal(struct vchiq_state *state, struct vchiq_instance *instance)
{
struct vchiq_service *service;
@@ -2935,8 +2935,6 @@ vchiq_shutdown_internal(struct vchiq_state *state, struct vchiq_instance *instan
(void)vchiq_remove_service(service->handle);
unlock_service(service);
}
return VCHIQ_SUCCESS;
}
enum vchiq_status
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+1 -1
View File
@@ -563,7 +563,7 @@ vchiq_terminate_service_internal(struct vchiq_service *service);
extern void
vchiq_free_service_internal(struct vchiq_service *service);
extern enum vchiq_status
extern void
vchiq_shutdown_internal(struct vchiq_state *state, struct vchiq_instance *instance);
extern void