drm/amdgpu: Drop unnecessary return statements

There is no reason to call return at the end of function that
returns void.

Fixes the below:

WARNING: void function return statements are not generally useful

Thus remove such a statement in the affected functions.

Cc: Christian König <christian.koenig@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Pan, Xinhui" <Xinhui.Pan@amd.com>
Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h
index 3c988cc406e49b73e8767bba62421de72617b778..381101d2bf05f45b7f79a6919df4fe57ddb4a3f1 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h
@@ -112,7 +112,6 @@ fallback:
        cur->remaining = size;
        cur->node = NULL;
        WARN_ON(res && start + size > res->size);
-       return;
 }
 
 /**

diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
index d95b2dc7806341d777fd90f0b63ef39f08afee7f..3ee219aa289188e2665950dd61d19d06b5d7c833 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
+++ b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
@@ -228,7 +228,6 @@ error:
 register_acpi_backlight:
        /* Try registering an ACPI video backlight device instead. */
        acpi_video_register_backlight();
-       return;
 }
 
 void

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
index e7ae3723323435f6c4bbb18bbd1e4e05feb3c4af..065b2bd5f5a656dd0763655607c37d65a53c22ea 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c
@@ -746,8 +746,6 @@ void gfx_v9_4_2_init_golden_registers(struct amdgpu_device *adev,
                         die_id);
                break;
        }
-
-       return;
 }
 
 void gfx_v9_4_2_debug_trap_config_init(struct amdgpu_device *adev,

diff --git a/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c b/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c
index ec0c8f8b465ab27bc9afdd03f76f5013ddaa877d..d9ed7332d805d3fca1bd0343ebc804e69dc44595 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/ih_v6_0.c
@@ -641,8 +641,6 @@ static void ih_v6_0_update_clockgating_state(struct amdgpu_device *adev,
                if (def != data)
                        WREG32_SOC15(OSSSYS, 0, regIH_CLK_CTRL, data);
        }
-
-       return;
 }
 
 static int ih_v6_0_set_clockgating_state(void *handle,
@@ -726,8 +724,6 @@ static void ih_v6_0_get_clockgating_state(void *handle, u64 *flags)
 
        if (!RREG32_SOC15(OSSSYS, 0, regIH_CLK_CTRL))
                *flags |= AMD_CG_SUPPORT_IH_CG;
-
-       return;
 }
 
 static const struct amd_ip_funcs ih_v6_0_ip_funcs = {

diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
index bb1873363d75bbd2152b5d5052728d9bae214882..e64b33115848d204a4d81eb9530df5bf95fdf796 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
+++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c
@@ -665,8 +665,6 @@ static void navi10_ih_update_clockgating_state(struct amdgpu_device *adev,
                if (def != data)
                        WREG32_SOC15(OSSSYS, 0, mmIH_CLK_CTRL, data);
        }
-
-       return;
 }
 
 static int navi10_ih_set_clockgating_state(void *handle,
@@ -691,8 +689,6 @@ static void navi10_ih_get_clockgating_state(void *handle, u64 *flags)
 
        if (!RREG32_SOC15(OSSSYS, 0, mmIH_CLK_CTRL))
                *flags |= AMD_CG_SUPPORT_IH_CG;
-
-       return;
 }
 
 static const struct amd_ip_funcs navi10_ih_ip_funcs = {

diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
index f85eec05d2181594763eb3a4062aa9c85414f073..cc034a74060568b72e3e5420208f84c8ce7d0b0a 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
@@ -173,8 +173,6 @@ static void nbio_v7_9_sdma_doorbell_range(struct amdgpu_device *adev, int instan
        default:
                break;
        }
-
-       return;
 }
 
 static void nbio_v7_9_vcn_doorbell_range(struct amdgpu_device *adev, bool use_doorbell,
@@ -556,7 +554,6 @@ const struct amdgpu_nbio_funcs nbio_v7_9_funcs = {
 static void nbio_v7_9_query_ras_error_count(struct amdgpu_device *adev,
                                        void *ras_error_status)
 {
-       return;
 }
 
 static void nbio_v7_9_handle_ras_controller_intr_no_bifring(struct amdgpu_device *adev)

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index 0535cabe3b160146147a4c992ad5e8c2793b27e7..1995c7459f20fac2fb3497085aaf5787402a027e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -1115,8 +1115,6 @@ static void nv_common_get_clockgating_state(void *handle, u64 *flags)
        adev->hdp.funcs->get_clock_gating_state(adev, flags);
 
        adev->smuio.funcs->get_clock_gating_state(adev, flags);
-
-       return;
 }
 
 static const struct amd_ip_funcs nv_common_ip_funcs = {

diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c
index 92a80780ab726025cd740266fbfeaa39c70f6401..6fcc4f7be1176e3c305cf5e15d2af3e71caae1bc 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -885,8 +885,6 @@ static void soc21_common_get_clockgating_state(void *handle, u64 *flags)
        adev->nbio.funcs->get_clockgating_state(adev, flags);
 
        adev->hdp.funcs->get_clock_gating_state(adev, flags);
-
-       return;
 }
 
 static const struct amd_ip_funcs soc21_common_ip_funcs = {

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
index bd0fef2a92a80585fb2cb513e63654848391f4a2..7ab9263d3e194fe25c22a230434e0dcaa78e444c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
@@ -877,8 +877,6 @@ static void vcn_v4_0_enable_clock_gating(struct amdgpu_device *adev, int inst)
                | UVD_SUVD_CGC_CTRL__IME_MODE_MASK
                | UVD_SUVD_CGC_CTRL__SITE_MODE_MASK);
        WREG32_SOC15(VCN, inst, regUVD_SUVD_CGC_CTRL, data);
-
-       return;
 }
 
 static void vcn_v4_0_enable_ras(struct amdgpu_device *adev, int inst_idx,