Commit c74541f7 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

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: default avatarNicolas Saenz Julienne <nsaenz@kernel.org>
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1619347863-16080-7-git-send-email-stefan.wahren@i2se.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 82aa95ee

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c

+2 −6
Original line number Diff line number Diff line
@@ -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*

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+1 −2
Original line number Diff line number Diff line
@@ -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

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h

+1 −1
Original line number Diff line number Diff line
@@ -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);