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>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index 8782ebe0b39a59dc8b142b0fda3e36515dfc40ed..7c336d092232aac16215b58ecdb8aba77c1f3071 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -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*

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 367fa3d371eb00847f3a32a19a25096abab7ff00..2774407bbb87723e9a8bad66d08ca3dcf6806834 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -2312,7 +2312,7 @@ exit:
        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

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
index 24c331c94354dad65ca146a8c73b82ca1eb28228..c7d2cf1f2e68a7b564d96873c2650f8d96152f1f 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
@@ -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);