mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-05 15:49:42 -04:00
staging: vchiq_arm: drop return value of vchiq_arm_init_state
The function vchiq_arm_init_state() cannot fail. So drop the return value and the unnecessary code. Reviewed-by: Nicolas Saenz Julienne <nsaenz@kernel.org> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Link: https://lore.kernel.org/r/1619347863-16080-7-git-send-email-stefan.wahren@i2se.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
82aa95ee2d
commit
c74541f7c7
@@ -172,7 +172,6 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
|
||||
enum vchiq_status
|
||||
vchiq_platform_init_state(struct vchiq_state *state)
|
||||
{
|
||||
enum vchiq_status status = VCHIQ_SUCCESS;
|
||||
struct vchiq_2835_state *platform_state;
|
||||
|
||||
state->platform_state = kzalloc(sizeof(*platform_state), GFP_KERNEL);
|
||||
@@ -182,12 +181,9 @@ vchiq_platform_init_state(struct vchiq_state *state)
|
||||
platform_state = (struct vchiq_2835_state *)state->platform_state;
|
||||
|
||||
platform_state->inited = 1;
|
||||
status = vchiq_arm_init_state(state, &platform_state->arm_state);
|
||||
vchiq_arm_init_state(state, &platform_state->arm_state);
|
||||
|
||||
if (status != VCHIQ_SUCCESS)
|
||||
platform_state->inited = 0;
|
||||
|
||||
return status;
|
||||
return VCHIQ_SUCCESS;
|
||||
}
|
||||
|
||||
struct vchiq_arm_state*
|
||||
|
||||
@@ -2312,7 +2312,7 @@ vchiq_keepalive_thread_func(void *v)
|
||||
return 0;
|
||||
}
|
||||
|
||||
enum vchiq_status
|
||||
void
|
||||
vchiq_arm_init_state(struct vchiq_state *state,
|
||||
struct vchiq_arm_state *arm_state)
|
||||
{
|
||||
@@ -2328,7 +2328,6 @@ vchiq_arm_init_state(struct vchiq_state *state,
|
||||
arm_state->first_connect = 0;
|
||||
|
||||
}
|
||||
return VCHIQ_SUCCESS;
|
||||
}
|
||||
|
||||
enum vchiq_status
|
||||
|
||||
@@ -67,7 +67,7 @@ int vchiq_platform_init(struct platform_device *pdev,
|
||||
extern struct vchiq_state *
|
||||
vchiq_get_state(void);
|
||||
|
||||
extern enum vchiq_status
|
||||
extern void
|
||||
vchiq_arm_init_state(struct vchiq_state *state,
|
||||
struct vchiq_arm_state *arm_state);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user