Applied. Thanks!
Alex
On Mon, Oct 26, 2020 at 11:31 AM Zhang Qilong <zhangqilong3@xxxxxxxxxx> wrote:
>
> The 'break' is unnecessary because of previous
> 'return', discard it.
>
> Signed-off-by: Zhang Qilong <zhangqilong3@xxxxxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 6 ------
> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 ----
> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 7 -------
> 3 files changed, 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
> index 8339c8c3a328..fa817ebff980 100644
> --- a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
> +++ b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
> @@ -499,10 +499,8 @@ int amdgpu_atombios_encoder_get_encoder_mode(struct drm_encoder *encoder)
> } else {
> return ATOM_ENCODER_MODE_DVI;
> }
> - break;
> case DRM_MODE_CONNECTOR_LVDS:
> return ATOM_ENCODER_MODE_LVDS;
> - break;
> case DRM_MODE_CONNECTOR_DisplayPort:
> dig_connector = amdgpu_connector->con_priv;
> if ((dig_connector->dp_sink_type == CONNECTOR_OBJECT_ID_DISPLAYPORT) ||
> @@ -519,20 +517,16 @@ int amdgpu_atombios_encoder_get_encoder_mode(struct drm_encoder *encoder)
> } else {
> return ATOM_ENCODER_MODE_DVI;
> }
> - break;
> case DRM_MODE_CONNECTOR_eDP:
> return ATOM_ENCODER_MODE_DP;
> case DRM_MODE_CONNECTOR_DVIA:
> case DRM_MODE_CONNECTOR_VGA:
> return ATOM_ENCODER_MODE_CRT;
> - break;
> case DRM_MODE_CONNECTOR_Composite:
> case DRM_MODE_CONNECTOR_SVIDEO:
> case DRM_MODE_CONNECTOR_9PinDIN:
> /* fix me */
> return ATOM_ENCODER_MODE_TV;
> - /*return ATOM_ENCODER_MODE_CV;*/
> - break;
> }
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index 5963cbe0d455..34448df0ccf3 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -2202,22 +2202,18 @@ static int dce_v10_0_pick_dig_encoder(struct drm_encoder *encoder)
> return 1;
> else
> return 0;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
> if (dig->linkb)
> return 3;
> else
> return 2;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
> if (dig->linkb)
> return 5;
> else
> return 4;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:
> return 6;
> - break;
> default:
> DRM_ERROR("invalid encoder_id: 0x%x\n", amdgpu_encoder->encoder_id);
> return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index 1954472c8e8f..eb16f7529223 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -2235,22 +2235,18 @@ static int dce_v11_0_pick_dig_encoder(struct drm_encoder *encoder)
> return 1;
> else
> return 0;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
> if (dig->linkb)
> return 3;
> else
> return 2;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
> if (dig->linkb)
> return 5;
> else
> return 4;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY3:
> return 6;
> - break;
> default:
> DRM_ERROR("invalid encoder_id: 0x%x\n", amdgpu_encoder->encoder_id);
> return 0;
> @@ -2304,19 +2300,16 @@ static u32 dce_v11_0_pick_pll(struct drm_crtc *crtc)
> return ATOM_COMBOPHY_PLL1;
> else
> return ATOM_COMBOPHY_PLL0;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1:
> if (dig->linkb)
> return ATOM_COMBOPHY_PLL3;
> else
> return ATOM_COMBOPHY_PLL2;
> - break;
> case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2:
> if (dig->linkb)
> return ATOM_COMBOPHY_PLL5;
> else
> return ATOM_COMBOPHY_PLL4;
> - break;
> default:
> DRM_ERROR("invalid encoder_id: 0x%x\n", amdgpu_encoder->encoder_id);
> return ATOM_PPLL_INVALID;
> --
> 2.17.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
